@jay-framework/compiler-jay-html 0.15.4 → 0.15.5

package/dist/index.d.cts

@@ -281,6 +281,128 @@ declare function injectHeadfullFSTemplates(html: string, sourceDir: string, impo
 declare function parseJayFile(html: string, filename: string, filePath: string, options: ResolveTsConfigOptions, linkedContractResolver: JayImportResolver, projectRoot: string): Promise<WithValidations<JayHtmlSourceFile>>;
 declare function getJayHtmlImports(html: string): string[];
 
+declare const htmlElementTagNameMap: {
+    a: string;
+    abbr: string;
+    address: string;
+    applet: string;
+    area: string;
+    article: string;
+    aside: string;
+    audio: string;
+    b: string;
+    base: string;
+    basefont: string;
+    bdi: string;
+    bdo: string;
+    blockquote: string;
+    body: string;
+    br: string;
+    button: string;
+    canvas: string;
+    caption: string;
+    cite: string;
+    code: string;
+    col: string;
+    colgroup: string;
+    data: string;
+    datalist: string;
+    dd: string;
+    del: string;
+    details: string;
+    dfn: string;
+    dialog: string;
+    dir: string;
+    div: string;
+    dl: string;
+    dt: string;
+    em: string;
+    embed: string;
+    fieldset: string;
+    figcaption: string;
+    figure: string;
+    font: string;
+    footer: string;
+    form: string;
+    frame: string;
+    frameset: string;
+    h1: string;
+    h2: string;
+    h3: string;
+    h4: string;
+    h5: string;
+    h6: string;
+    head: string;
+    header: string;
+    hgroup: string;
+    hr: string;
+    html: string;
+    i: string;
+    iframe: string;
+    img: string;
+    input: string;
+    ins: string;
+    kbd: string;
+    label: string;
+    legend: string;
+    li: string;
+    link: string;
+    main: string;
+    map: string;
+    mark: string;
+    marquee: string;
+    menu: string;
+    meta: string;
+    meter: string;
+    nav: string;
+    noscript: string;
+    object: string;
+    ol: string;
+    optgroup: string;
+    option: string;
+    output: string;
+    p: string;
+    param: string;
+    picture: string;
+    pre: string;
+    progress: string;
+    q: string;
+    rp: string;
+    rt: string;
+    ruby: string;
+    s: string;
+    samp: string;
+    script: string;
+    section: string;
+    select: string;
+    slot: string;
+    small: string;
+    source: string;
+    span: string;
+    strong: string;
+    style: string;
+    sub: string;
+    summary: string;
+    sup: string;
+    table: string;
+    tbody: string;
+    td: string;
+    template: string;
+    textarea: string;
+    tfoot: string;
+    th: string;
+    thead: string;
+    time: string;
+    title: string;
+    tr: string;
+    track: string;
+    u: string;
+    ul: string;
+    var: string;
+    video: string;
+    wbr: string;
+};
+
 declare function generateTypes(types: JayType): string;
 
 /**
@@ -456,4 +578,4 @@ declare function resolveHeadlessInstances(preRenderedJayHtml: string, instanceDa
  */
 declare function hasSlowPhaseProperties(contract: Contract | undefined): boolean;
 
-export { type ActionDefinition, type AssignCoordinatesOptions, type AssignCoordinatesResult, type Contract, type ContractImportInfo, type ContractParam, type ContractParamKind, type ContractProp, type ContractResolver, type ContractTag, ContractTagType, type DiscoveredHeadlessInstance, type EnumToImport, type ForEachHeadlessInstance, type HeadlessContractInfo, type HeadlessInstanceDiscoveryResult, type HeadlessInstanceResolvedData, JAY_IMPORT_RESOLVER, type JayContractImportLink, type JayHtmlSourceFile, type JayImportResolver, type PhaseViewStates, type RenderingPhase, type ServerElementOptions, type SlowRenderInput, type SlowRenderOutput, assignCoordinates, assignCoordinatesToJayHtml, buildInstanceCoordinateKey, compileAction, compileContract, contractToAllPhaseViewStates, contractToImportsViewStateAndRefs, contractToPhaseViewState, createPhaseContract, defaultContractResolver, discoverHeadlessInstances, filterTagsByPhase, generateElementBridgeFile, generateElementDefinitionFile, generateElementFile, generateElementFileReactTarget, generateElementHydrateFile, generateSandboxRootFile, generateServerElementFile, generateTypes, getEffectivePhase, getJayHtmlImports, getLinkedContractDir, hasSlowPhaseProperties, injectHeadfullFSTemplates, isTagInPhase, loadLinkedContract, parseAction, parseContract, parseEnumValues, parseIsEnum, parseJayFile, renderRefsType, resolveHeadlessInstances, slowRenderTransform, validateContractPhases };
+export { type ActionDefinition, type AssignCoordinatesOptions, type AssignCoordinatesResult, type Contract, type ContractImportInfo, type ContractParam, type ContractParamKind, type ContractProp, type ContractResolver, type ContractTag, ContractTagType, type DiscoveredHeadlessInstance, type EnumToImport, type ForEachHeadlessInstance, type HeadlessContractInfo, type HeadlessInstanceDiscoveryResult, type HeadlessInstanceResolvedData, JAY_IMPORT_RESOLVER, type JayContractImportLink, type JayHtmlSourceFile, type JayImportResolver, type PhaseViewStates, type RenderingPhase, type ServerElementOptions, type SlowRenderInput, type SlowRenderOutput, assignCoordinates, assignCoordinatesToJayHtml, buildInstanceCoordinateKey, compileAction, compileContract, contractToAllPhaseViewStates, contractToImportsViewStateAndRefs, contractToPhaseViewState, createPhaseContract, defaultContractResolver, discoverHeadlessInstances, filterTagsByPhase, generateElementBridgeFile, generateElementDefinitionFile, generateElementFile, generateElementFileReactTarget, generateElementHydrateFile, generateSandboxRootFile, generateServerElementFile, generateTypes, getEffectivePhase, getJayHtmlImports, getLinkedContractDir, hasSlowPhaseProperties, htmlElementTagNameMap, injectHeadfullFSTemplates, isTagInPhase, loadLinkedContract, parseAction, parseContract, parseEnumValues, parseIsEnum, parseJayFile, renderRefsType, resolveHeadlessInstances, slowRenderTransform, validateContractPhases };

package/dist/index.js

@@ -1,4 +1,4 @@
-import { JayImportedType, isObjectType as isObjectType$1, isImportedType, isRecursiveType, JayUnknown, RenderFragment, Imports, Import, WithValidations, isArrayType as isArrayType$1, isAtomicType, isPromiseType, isEnumType, hasRefs, GenerateTarget, JayTypeAlias, JayUnionType, mkRefsTree, JayComponentType, JayHTMLType, mkRef, equalJayTypes, getModeFileExtension, RuntimeMode, nestRefs, mergeRefsTrees, SourceFileFormat, JayObjectType, JayArrayType, JayPromiseType, resolvePrimitiveType, JayEnumType, JayRecursiveType, JAY_CONTRACT_EXTENSION as JAY_CONTRACT_EXTENSION$1, ImportsFor, JAY_FULLSTACK_COMPONENTS, computeInstanceKey, JayErrorType, isStaticCoordinate, compileCoordinateExpr, JayOptionalType, isOptionalType, resolvePluginComponent, resolvePluginManifest } from "@jay-framework/compiler-shared";
+import { JayImportedType, isObjectType as isObjectType$1, isImportedType, isRecursiveType, JayUnknown, RenderFragment, Imports, Import, WithValidations, isArrayType as isArrayType$1, isAtomicType, isPromiseType, isEnumType, hasRefs, GenerateTarget, JayTypeAlias, JayUnionType, mkRefsTree, JayComponentType, JayHTMLType, mkRef, equalJayTypes, getModeFileExtension, RuntimeMode, nestRefs, mergeRefsTrees, SourceFileFormat, JayEnumType, JayObjectType, JayArrayType, JayPromiseType, resolvePrimitiveType, JayRecursiveType, JAY_CONTRACT_EXTENSION as JAY_CONTRACT_EXTENSION$1, ImportsFor, JAY_FULLSTACK_COMPONENTS, computeInstanceKey, JayErrorType, isStaticCoordinate, compileCoordinateExpr, JayOptionalType, JayRecordType, isOptionalType, isRecordType, resolvePluginComponent, resolvePluginManifest } from "@jay-framework/compiler-shared";
 import path from "path";
 import { getLogger } from "@jay-framework/logger";
 import fs from "fs/promises";
@@ -6727,7 +6727,12 @@ function peg$parse(input, options) {
   }, peg$c137 = function(head, oper, val) {
     if (oper.length === 2)
       oper = oper + "=";
-    return head.render().map((_) => `${_} ${oper} ${head.resolvedType.name}.${val}`);
+    const enumName = head.resolvedType.alias || head.resolvedType.name;
+    const fragment = head.render().map((_) => `${_} ${oper} ${enumName}.${val}`);
+    if (head.resolvedType.values && !head.resolvedType.values.includes(val)) {
+      fragment.validations = [...fragment.validations, `Unknown enum value "${val}" for type ${head.resolvedType.name}. Valid values: ${head.resolvedType.values.join(", ")}`];
+    }
+    return fragment;
   }, peg$c138 = function() {
     return vars.resolveAccessor(["."]);
   }, peg$c139 = function(head, tail) {
@@ -17733,6 +17738,46 @@ function resolveImportedType(imports, type2) {
   } else
     return JayUnknown;
 }
+function deduplicateEnums(enums) {
+  const seen = /* @__PURE__ */ new Set();
+  return enums.filter((e2) => {
+    const key = `${e2.declaringModule}::${e2.type.name}`;
+    if (seen.has(key))
+      return false;
+    seen.add(key);
+    return true;
+  });
+}
+function resolveEnumCollisions(allHeadlessImports) {
+  const enumsByName = /* @__PURE__ */ new Map();
+  for (const headless of allHeadlessImports) {
+    for (const link of headless.contractLinks) {
+      for (const importName of link.names) {
+        if (importName.type instanceof JayEnumType) {
+          const entries = enumsByName.get(importName.type.name) || [];
+          entries.push({ importName, module: link.module });
+          enumsByName.set(importName.type.name, entries);
+        }
+      }
+    }
+  }
+  for (const [, entries] of enumsByName) {
+    if (entries.length <= 1)
+      continue;
+    let counter = 0;
+    const firstEntry = entries[0];
+    for (let i = 1; i < entries.length; i++) {
+      const entry = entries[i];
+      const entryEnum = entry.importName.type;
+      if (entry.module === firstEntry.module)
+        continue;
+      counter++;
+      const alias = `${entryEnum.name}$${counter}`;
+      entryEnum.alias = alias;
+      entry.importName.as = alias;
+    }
+  }
+}
 function isRecursiveReference$1(typeString) {
   return typeof typeString === "string" && typeString.startsWith("$/");
 }
@@ -18133,8 +18178,10 @@ async function parseHeadlessImports(elements, validations, filePath, importResol
             ...enumsFromContract.map((_) => ({ name: _.name, type: _ }))
           ]
         };
-        const enumsFromOtherContracts = enumsToImportRelativeToJayHtml.filter(
-          (_) => _.declaringModule !== relativeContractPath
+        const enumsFromOtherContracts = deduplicateEnums(
+          enumsToImportRelativeToJayHtml.filter(
+            (_) => _.declaringModule !== relativeContractPath
+          )
         );
         const enumImportLinks = Object.entries(
           enumsFromOtherContracts.reduce(
@@ -18341,8 +18388,10 @@ async function parseHeadfullFSImports(elements, validations, filePath, importRes
             ...enumsFromContract.map((_) => ({ name: _.name, type: _ }))
           ]
         };
-        const enumsFromOtherContracts = enumsToImportRelativeToJayHtml.filter(
-          (_) => _.declaringModule !== relativeContractPath
+        const enumsFromOtherContracts = deduplicateEnums(
+          enumsToImportRelativeToJayHtml.filter(
+            (_) => _.declaringModule !== relativeContractPath
+          )
         );
         const enumImportLinks = Object.entries(
           enumsFromOtherContracts.reduce(
@@ -18533,6 +18582,7 @@ async function parseJayFile(html2, filename, filePath, options, linkedContractRe
     projectRoot
   );
   const allHeadlessImports = [...headlessImports, ...headfullFSResult.headlessImports];
+  resolveEnumCollisions(allHeadlessImports);
   const importNames = headfullImports.flatMap((_) => _.names);
   const types2 = await parseTypes(
     jayYaml,
@@ -19487,28 +19537,94 @@ ${context.indent.firstLine}    ${createBody})`,
       insideFastForEach: true,
       varMappings: { ...context.varMappings, [trackBy]: trackByExpr }
     };
-    const itemContent = mergeHydrateFragments(
-      itemChildNodes.map((child) => renderHydrateNode(child, itemContext)),
-      ",\n"
-    );
     const itemRenderCtx = buildRenderContext(itemContext);
     const itemAttrs = renderDynamicAttributes(element, itemRenderCtx);
     const itemHasDynamicAttrs = itemAttrs.imports.has(Import.dynamicAttribute) || itemAttrs.imports.has(Import.dynamicProperty) || itemAttrs.imports.has(Import.booleanAttribute);
     const itemRefFragment = renderElementRef$1(element, itemRenderCtx);
     const needsItemAdoption = itemHasDynamicAttrs || !!itemRefFragment.rendered.trim();
+    const itemHasInteractiveChildren = itemChildNodes.some(
+      (child) => child.nodeType === NodeType.ELEMENT_NODE && (isConditional(child) && conditionIsInteractive(
+        child.getAttribute("if"),
+        context.interactivePaths
+      ) || isForEach(child))
+    );
     let adoptBody;
-    if (needsItemAdoption) {
+    let itemContent;
+    if (itemHasInteractiveChildren) {
+      const childParts = [];
+      let childImports = Imports.none();
+      const childValidations = [];
+      const childRefs = [];
+      for (const child of itemChildNodes) {
+        if (child.nodeType !== NodeType.ELEMENT_NODE) {
+          const frag = renderHydrateNode(child, itemContext);
+          if (frag.rendered.trim()) {
+            childParts.push(frag.rendered);
+            childImports = childImports.plus(frag.imports);
+            childValidations.push(...frag.validations);
+            if (frag.refs)
+              childRefs.push(frag.refs);
+          }
+          continue;
+        }
+        const htmlChild = child;
+        if (isConditional(htmlChild) && conditionIsInteractive(
+          htmlChild.getAttribute("if"),
+          context.interactivePaths
+        ) || isForEach(htmlChild)) {
+          const frag = renderHydrateNode(child, itemContext);
+          if (frag.rendered.trim()) {
+            childParts.push(frag.rendered);
+            childImports = childImports.plus(frag.imports);
+            childValidations.push(...frag.validations);
+            if (frag.refs)
+              childRefs.push(frag.refs);
+          }
+        } else {
+          const frag = renderHydrateNode(child, itemContext);
+          if (frag.rendered.trim()) {
+            childParts.push(frag.rendered);
+            childImports = childImports.plus(frag.imports);
+            childValidations.push(...frag.validations);
+            if (frag.refs)
+              childRefs.push(frag.refs);
+          } else {
+            childParts.push(`${itemContext.indent.firstLine}STATIC`);
+            childImports = childImports.plus(Import.STATIC);
+          }
+        }
+      }
       const refSuffix = itemRefFragment.rendered ? `, ${itemRefFragment.rendered}` : "";
-      const childrenArr = itemContent.rendered.trim() ? `[
-${itemContent.rendered},
+      const childrenArr = childParts.length ? `[
+${childParts.join(",\n")},
 ${indent.firstLine}        ]` : "[]";
       adoptBody = `() => [
-${indent.firstLine}        adoptElement("", ${itemAttrs.rendered}, ${childrenArr}${refSuffix}),
+${indent.firstLine}        adoptDynamicElement("", ${itemAttrs.rendered}, ${childrenArr}${refSuffix}),
 ${indent.firstLine}    ]`;
+      itemContent = new RenderFragment(
+        "",
+        Imports.for(Import.adoptDynamicElement).plus(childImports),
+        childValidations,
+        mergeRefsTrees(...childRefs)
+      );
     } else {
-      adoptBody = itemContent.rendered.trim() ? `() => [
+      itemContent = mergeHydrateFragments(
+        itemChildNodes.map((child) => renderHydrateNode(child, itemContext)),
+        ",\n"
+      );
+      if (needsItemAdoption) {
+        const refSuffix = itemRefFragment.rendered ? `, ${itemRefFragment.rendered}` : "";
+        const childrenArr = itemContent.rendered.trim() ? `[
+${itemContent.rendered},
+${indent.firstLine}        ]` : "[]";
+        adoptBody = `() => [
+${indent.firstLine}        adoptElement("", ${itemAttrs.rendered}, ${childrenArr}${refSuffix}),
+${indent.firstLine}    ]`;
+      } else {
+        adoptBody = itemContent.rendered.trim() ? `() => [
 ${itemContent.rendered},
 ${indent.firstLine}    ]` : "() => []";
+      }
     }
     const createRenderContext = {
       ...renderContext,
@@ -19542,7 +19658,7 @@ ${indent.firstLine}    ]` : "() => []";
 ${indent.firstLine}    return ${forEachElementFunc}('${element.rawTagName}', ${createAttributes.rendered}, [${createChildren.rendered}]${createRefSuffix});
 ${indent.firstLine}    }`;
     let allImports = Imports.for(Import.hydrateForEach).plus(forEachElementImport).plus(forEachFragment.imports).plus(itemContent.imports).plus(createChildren.imports).plus(createAttributes.imports).plus(itemAttrs.imports).plus(itemRefFragment.imports).plus(createItemRef.imports);
-    if (needsItemAdoption) {
+    if (needsItemAdoption && !itemHasInteractiveChildren) {
       allImports = allImports.plus(Import.adoptElement);
     }
     const hydrateForEachFragment = new RenderFragment(
@@ -21312,10 +21428,8 @@ function generateElementHydrateFile(jayFile, importerMode) {
   }
   const typeOnlyImports = renderedImplementation.imports.minus(renderedHydrate.imports).minus(Import.element).minus(Import.dynamicText).minus(Import.dynamicElement).minus(Import.conditional).minus(Import.forEach);
   const hydrateImports = typeOnlyImports.plus(Import.jayElement).plus(renderedHydrate.imports);
-  const cssImport = generateCssImport(jayFile);
   const renderedFile = [
     renderImports$1(hydrateImports, ImportsFor.implementation, jayFile.imports, importerMode),
-    cssImport,
     types2,
     renderedRefs,
     phaseTypes,
@@ -22199,8 +22313,22 @@ function renderServerAttributes(element, context) {
         parts.push(w(indent, `' class="${escaped}"'`));
       }
     } else if (attrCanonical === "style") {
-      const escaped = attrValue.replace(/\\/g, "\\\\").replace(/'/g, "\\'");
-      parts.push(w(indent, `' style="${escaped}"'`));
+      const [fragment, isDynamic] = parseServerTemplateExpression(
+        textEscape$1(attrValue),
+        variables
+      );
+      if (isDynamic) {
+        parts.push(
+          w(
+            indent,
+            `' style="' + escapeAttr(String(${fragment.rendered})) + '"'`,
+            Imports.for(Import.escapeAttr)
+          )
+        );
+      } else {
+        const escaped = attrValue.replace(/\\/g, "\\\\").replace(/'/g, "\\'");
+        parts.push(w(indent, `' style="${escaped}"'`));
+      }
     } else {
       const [fragment, isDynamic] = parseServerTemplateExpression(
         textEscape$1(attrValue),
@@ -22382,8 +22510,21 @@ function renderServerAttributesAsString(element, context) {
         parts.push(new RenderFragment(`' class="${escaped}"'`));
       }
     } else if (attrCanonical === "style") {
-      const escaped = attrValue.replace(/\\/g, "\\\\").replace(/'/g, "\\'");
-      parts.push(new RenderFragment(`' style="${escaped}"'`));
+      const [fragment, isDynamic] = parseServerTemplateExpression(
+        textEscape$1(attrValue),
+        variables
+      );
+      if (isDynamic) {
+        parts.push(
+          new RenderFragment(
+            `' style="' + escapeAttr(String(${fragment.rendered})) + '"'`,
+            Imports.for(Import.escapeAttr)
+          )
+        );
+      } else {
+        const escaped = attrValue.replace(/\\/g, "\\\\").replace(/'/g, "\\'");
+        parts.push(new RenderFragment(`' style="${escaped}"'`));
+      }
     } else {
       const [fragment, isDynamic] = parseServerTemplateExpression(
         textEscape$1(attrValue),
@@ -22753,6 +22894,13 @@ function resolveStringType(value, importAliases, path2) {
     const name = path2.length > 0 ? path2[path2.length - 1] : "value";
     return new JayEnumType(name, parseEnumValues(value));
   }
+  if (value.startsWith("record(") && value.endsWith(")")) {
+    const innerStr = value.slice(7, -1);
+    const innerType = resolveStringType(innerStr, importAliases, path2);
+    if (innerType)
+      return new JayRecordType(innerType);
+    return null;
+  }
   if (importAliases.has(value)) {
     return new JayImportedType(value, JayUnknown, false);
   }
@@ -22874,6 +23022,8 @@ function collectImportedAliases(type2, aliases2) {
     }
   } else if (isArrayType$1(type2)) {
     collectImportedAliases(type2.itemType, aliases2);
+  } else if (isRecordType(type2)) {
+    collectImportedAliases(type2.itemType, aliases2);
   }
 }
 function renderType(type2, aliasToViewState, indent) {
@@ -22894,6 +23044,10 @@ function renderType(type2, aliasToViewState, indent) {
     const itemStr = renderType(type2.itemType, aliasToViewState, indent + "  ");
     return `Array<${itemStr}>`;
   }
+  if (isRecordType(type2)) {
+    const valueStr = renderType(type2.itemType, aliasToViewState, indent + "  ");
+    return `Record<string, ${valueStr}>`;
+  }
   if (isObjectType$1(type2)) {
     if (Object.keys(type2.props).length === 0) {
       return "Record<string, unknown>";
@@ -29957,6 +30111,7 @@ export {
   getJayHtmlImports,
   getLinkedContractDir,
   hasSlowPhaseProperties,
+  htmlElementTagNameMap,
   injectHeadfullFSTemplates,
   isTagInPhase,
   loadLinkedContract,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jay-framework/compiler-jay-html",
-  "version": "0.15.4",
+  "version": "0.15.5",
   "description": "",
   "license": "Apache-2.0",
   "main": "dist/index.js",
@@ -34,12 +34,12 @@
   },
   "author": "",
   "dependencies": {
-    "@jay-framework/compiler-analyze-exported-types": "^0.15.4",
-    "@jay-framework/compiler-shared": "^0.15.4",
-    "@jay-framework/component": "^0.15.4",
-    "@jay-framework/logger": "^0.15.4",
-    "@jay-framework/runtime": "^0.15.4",
-    "@jay-framework/secure": "^0.15.4",
+    "@jay-framework/compiler-analyze-exported-types": "^0.15.5",
+    "@jay-framework/compiler-shared": "^0.15.5",
+    "@jay-framework/component": "^0.15.5",
+    "@jay-framework/logger": "^0.15.5",
+    "@jay-framework/runtime": "^0.15.5",
+    "@jay-framework/secure": "^0.15.5",
     "@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.4",
-    "@jay-framework/dev-environment": "^0.15.4",
+    "@jay-framework/4-react": "^0.15.5",
+    "@jay-framework/dev-environment": "^0.15.5",
     "@testing-library/jest-dom": "^6.2.0",
     "@types/js-beautify": "^1",
     "@types/node": "^20.11.5",