@jay-framework/compiler-shared 0.6.10 → 0.7.0

package/dist/index.d.ts

@@ -1,4 +1,5 @@
 import * as prettier from 'prettier';
+export * from '@jay-framework/typescript-bridge';
 
 declare enum ImportsFor {
     definition = 0,
@@ -12,6 +13,7 @@ interface ImportName {
     usage: ImportsFor[];
 }
 declare const Import: {
+    baseJayElement: ImportName;
     jayElement: ImportName;
     element: ImportName;
     svgElement: ImportName;
@@ -24,10 +26,14 @@ declare const Import: {
     ReferencesManager: ImportName;
     SecureReferencesManager: ImportName;
     conditional: ImportName;
+    withData: ImportName;
     dynamicElement: ImportName;
     svgDynamicElement: ImportName;
     mathMLDynamicElement: ImportName;
     forEach: ImportName;
+    resolved: ImportName;
+    pending: ImportName;
+    rejected: ImportName;
     ConstructContext: ImportName;
     HTMLElementCollectionProxy: ImportName;
     HTMLElementProxy: ImportName;
@@ -101,7 +107,9 @@ declare enum JayTypeKind {
     component = 7,
     object = 8,
     array = 9,
-    union = 10
+    union = 10,
+    promise = 11,
+    recursive = 12
 }
 interface JayType {
     name: string;
@@ -185,6 +193,20 @@ declare class JayUnionType implements JayType {
     get name(): string;
     hasType(aType: JayType): any;
 }
+declare class JayPromiseType implements JayType {
+    readonly itemType: JayType;
+    constructor(itemType: JayType);
+    readonly kind = JayTypeKind.promise;
+    get name(): string;
+}
+declare class JayRecursiveType implements JayType {
+    readonly referencePath: string;
+    resolvedType?: JayType;
+    constructor(referencePath: string, resolvedType?: JayType);
+    readonly kind = JayTypeKind.recursive;
+    get name(): string;
+}
+declare const JayErrorType: JayObjectType;
 declare function isAtomicType(aType: JayType): aType is JayAtomicType;
 declare function isTypeAliasType(aType: JayType): aType is JayTypeAlias;
 declare function isEnumType(aType: JayType): aType is JayEnumType;
@@ -196,6 +218,10 @@ declare function isComponentType(aType: JayType): aType is JayComponentType;
 declare function isObjectType(aType: JayType): aType is JayObjectType;
 declare function isArrayType(aType: JayType): aType is JayArrayType;
 declare function isUnionType(aType: JayType): aType is JayUnionType;
+declare function isPromiseType(aType: JayType): aType is JayPromiseType;
+declare function isRecursiveType(aType: JayType): aType is JayRecursiveType;
+declare function isCurrencyType(aType: JayType): aType is JayAtomicType;
+declare function isDateWithTimezoneType(aType: JayType): aType is JayAtomicType;
 declare function equalJayTypes(a: JayType, b: JayType): any;
 
 interface JayImportName {
@@ -286,12 +312,18 @@ interface Ref {
     elementType: JayType;
 }
 declare function mkRef(ref: string, originalName: string, constName: string, repeated: boolean, autoRef: boolean, viewStateType: JayType, elementType: JayType): Ref;
+interface RecursiveRegion {
+    refName: string;
+    renderedContent: string;
+    viewStateType: string;
+}
 declare class RenderFragment {
     rendered: string;
     imports: Imports;
     validations: JayValidations;
     refs: RefsTree;
-    constructor(rendered: string, imports?: Imports, validations?: JayValidations, refs?: RefsTree);
+    recursiveRegions: RecursiveRegion[];
+    constructor(rendered: string, imports?: Imports, validations?: JayValidations, refs?: RefsTree, recursiveRegions?: RecursiveRegion[]);
     map(f: (s: string) => string): RenderFragment;
     plusImport(imp: Imports): RenderFragment;
     static empty(): RenderFragment;
@@ -317,4 +349,4 @@ declare function prettify(code: string, options?: prettier.Options): Promise<str
 declare function prettifyHtml(html: string): string;
 declare function removeComments(code: string): string;
 
-export { CSS_EXTENSION, type CompilerSourceFile, GenerateTarget, type GenericTypescriptSourceFile, Import, type ImportName, type ImportedRefsTree, Imports, ImportsFor, JAY_4_REACT, JAY_COMPONENT, JAY_CONTRACT_DTS_EXTENSION, JAY_CONTRACT_EXTENSION, JAY_DTS_EXTENSION, JAY_EXTENSION, JAY_FULLSTACK_COMPONENTS, JAY_QUERY_MAIN_SANDBOX, JAY_QUERY_MAIN_SANDBOX_TS, JAY_QUERY_PREFIX, JAY_QUERY_WORKER_SANDBOX, JAY_QUERY_WORKER_SANDBOX_TS, JAY_QUERY_WORKER_TRUSTED, JAY_QUERY_WORKER_TRUSTED_TS, JAY_RUNTIME, JAY_SECURE, JAY_TS_EXTENSION, JayArrayType, JayAtomicType, JayBoolean, JayComponentApiMember, JayComponentType, JayDate, JayElementConstructorType, JayElementType, JayEnumType, JayHTMLType, type JayImportLink, type JayImportName, JayImportedType, JayNumber, JayObjectType, JayString, type JayType, JayTypeAlias, JayTypeKind, JayUnionType, JayUnknown, type JayValidations, MAKE_JAY_4_REACT_COMPONENT, MAKE_JAY_COMPONENT, MAKE_JAY_TSX_COMPONENT, type MainRuntimeModes, REACT, type Ref, type RefsTree, RenderFragment, RuntimeMode, SourceFileFormat, TSX_EXTENSION, TS_EXTENSION, WithValidations, checkValidationErrors, equalJayTypes, getJayTsFileSourcePath, getMode, getModeFileExtension, getModeFromExtension, hasExtension, hasJayModeExtension, hasRefs, isArrayType, isAtomicType, isComponentType, isElementConstructorType, isElementType, isEnumType, isHTMLType, isImportedType, isObjectType, isTypeAliasType, isUnionType, mergeRefsTrees, mkRef, mkRefsTree, nestRefs, prettify, prettifyHtml, removeComments, resolvePrimitiveType, withOriginalTrace, withoutExtension };
+export { CSS_EXTENSION, type CompilerSourceFile, GenerateTarget, type GenericTypescriptSourceFile, Import, type ImportName, type ImportedRefsTree, Imports, ImportsFor, JAY_4_REACT, JAY_COMPONENT, JAY_CONTRACT_DTS_EXTENSION, JAY_CONTRACT_EXTENSION, JAY_DTS_EXTENSION, JAY_EXTENSION, JAY_FULLSTACK_COMPONENTS, JAY_QUERY_MAIN_SANDBOX, JAY_QUERY_MAIN_SANDBOX_TS, JAY_QUERY_PREFIX, JAY_QUERY_WORKER_SANDBOX, JAY_QUERY_WORKER_SANDBOX_TS, JAY_QUERY_WORKER_TRUSTED, JAY_QUERY_WORKER_TRUSTED_TS, JAY_RUNTIME, JAY_SECURE, JAY_TS_EXTENSION, JayArrayType, JayAtomicType, JayBoolean, JayComponentApiMember, JayComponentType, JayDate, JayElementConstructorType, JayElementType, JayEnumType, JayErrorType, JayHTMLType, type JayImportLink, type JayImportName, JayImportedType, JayNumber, JayObjectType, JayPromiseType, JayRecursiveType, JayString, type JayType, JayTypeAlias, JayTypeKind, JayUnionType, JayUnknown, type JayValidations, MAKE_JAY_4_REACT_COMPONENT, MAKE_JAY_COMPONENT, MAKE_JAY_TSX_COMPONENT, type MainRuntimeModes, REACT, type RecursiveRegion, type Ref, type RefsTree, RenderFragment, RuntimeMode, SourceFileFormat, TSX_EXTENSION, TS_EXTENSION, WithValidations, checkValidationErrors, equalJayTypes, getJayTsFileSourcePath, getMode, getModeFileExtension, getModeFromExtension, hasExtension, hasJayModeExtension, hasRefs, isArrayType, isAtomicType, isComponentType, isCurrencyType, isDateWithTimezoneType, isElementConstructorType, isElementType, isEnumType, isHTMLType, isImportedType, isObjectType, isPromiseType, isRecursiveType, isTypeAliasType, isUnionType, mergeRefsTrees, mkRef, mkRefsTree, nestRefs, prettify, prettifyHtml, removeComments, resolvePrimitiveType, withOriginalTrace, withoutExtension };

package/dist/index.js

@@ -6,6 +6,7 @@ var __publicField = (obj, key, value) => {
 };
 import * as prettier from "prettier";
 import jsBeautify from "js-beautify";
+import { createRequire } from "module";
 const JAY_EXTENSION = ".jay-html";
 const CSS_EXTENSION = ".css";
 const JAY_CONTRACT_EXTENSION = ".jay-contract";
@@ -38,6 +39,13 @@ const importsOrder = {
   JAY_4_REACT: 4
 };
 const Import = {
+  baseJayElement: importStatementFragment(
+    JAY_RUNTIME,
+    "BaseJayElement",
+    1,
+    2
+    /* elementSandbox */
+  ),
   jayElement: importStatementFragment(
     JAY_RUNTIME,
     "JayElement",
@@ -114,6 +122,12 @@ const Import = {
     1
     /* implementation */
   ),
+  withData: importStatementFragment(
+    JAY_RUNTIME,
+    "withData",
+    1
+    /* implementation */
+  ),
   dynamicElement: importStatementFragment(
     JAY_RUNTIME,
     "dynamicElement as de",
@@ -138,6 +152,24 @@ const Import = {
     1
     /* implementation */
   ),
+  resolved: importStatementFragment(
+    JAY_RUNTIME,
+    "resolved",
+    1
+    /* implementation */
+  ),
+  pending: importStatementFragment(
+    JAY_RUNTIME,
+    "pending",
+    1
+    /* implementation */
+  ),
+  rejected: importStatementFragment(
+    JAY_RUNTIME,
+    "rejected",
+    1
+    /* implementation */
+  ),
   ConstructContext: importStatementFragment(
     JAY_RUNTIME,
     "ConstructContext",
@@ -405,8 +437,8 @@ class Imports {
   }
   static merge(imports1, imports2) {
     let merged = [];
-    for (let i = 0; i < Math.max(imports1.imports.length, imports2.imports.length); i++)
-      merged[i] = imports1.imports[i] || imports2.imports[i];
+    for (let i2 = 0; i2 < Math.max(imports1.imports.length, imports2.imports.length); i2++)
+      merged[i2] = imports1.imports[i2] || imports2.imports[i2];
     return new Imports(merged);
   }
 }
@@ -422,6 +454,8 @@ var JayTypeKind = /* @__PURE__ */ ((JayTypeKind2) => {
   JayTypeKind2[JayTypeKind2["object"] = 8] = "object";
   JayTypeKind2[JayTypeKind2["array"] = 9] = "array";
   JayTypeKind2[JayTypeKind2["union"] = 10] = "union";
+  JayTypeKind2[JayTypeKind2["promise"] = 11] = "promise";
+  JayTypeKind2[JayTypeKind2["recursive"] = 12] = "recursive";
   return JayTypeKind2;
 })(JayTypeKind || {});
 class JayAtomicType {
@@ -524,6 +558,30 @@ class JayUnionType {
     return !!this.ofTypes.find((bType) => equalJayTypes(aType, bType));
   }
 }
+class JayPromiseType {
+  constructor(itemType) {
+    __publicField(this, "kind", 11);
+    this.itemType = itemType;
+  }
+  get name() {
+    return `Promise<${this.itemType.name}>`;
+  }
+}
+class JayRecursiveType {
+  constructor(referencePath, resolvedType) {
+    __publicField(this, "kind", 12);
+    this.referencePath = referencePath;
+    this.resolvedType = resolvedType;
+  }
+  get name() {
+    return this.resolvedType?.name || `Recursive<${this.referencePath}>`;
+  }
+}
+const JayErrorType = new JayObjectType("Error", {
+  message: new JayAtomicType("string"),
+  name: new JayAtomicType("string"),
+  stack: new JayAtomicType("string")
+});
 function isAtomicType(aType) {
   return aType.kind === 0;
 }
@@ -557,11 +615,23 @@ function isArrayType(aType) {
 function isUnionType(aType) {
   return aType.kind === 10;
 }
+function isPromiseType(aType) {
+  return aType.kind === 11;
+}
+function isRecursiveType(aType) {
+  return aType.kind === 12;
+}
+function isCurrencyType(aType) {
+  return aType.kind === 0 && aType.name === "Currency";
+}
+function isDateWithTimezoneType(aType) {
+  return aType.kind === 0 && aType.name === "DateWithTimezone";
+}
 function equalJayTypes(a, b) {
   if (a.name !== b.name)
     return false;
   if (a instanceof JayAtomicType && b instanceof JayAtomicType)
-    return true;
+    return a.name === b.name;
   else if (a instanceof JayEnumType && b instanceof JayEnumType)
     return a.values.length === b.values.length && a.values.reduce(
       (res, a_val, currentIndex) => res && a_val === b.values[currentIndex],
@@ -590,6 +660,10 @@ function equalJayTypes(a, b) {
     return aProps.size === bProps.size && [...aProps].map((aProp) => bProps.has(aProp) && equalJayTypes(a[aProp], b[aProp]));
   } else if (a instanceof JayUnionType && b instanceof JayUnionType) {
     return a.ofTypes.length === b.ofTypes.length && a.ofTypes.reduce((res, aType) => res && b.hasType(aType), true);
+  } else if (a instanceof JayPromiseType && b instanceof JayPromiseType) {
+    return equalJayTypes(a.itemType, b.itemType);
+  } else if (a instanceof JayRecursiveType && b instanceof JayRecursiveType) {
+    return a.referencePath === b.referencePath;
   } else
     ;
 }
@@ -739,6 +813,8 @@ function hasRefs(refs, includingAutoRefs) {
 function nestRefs(path, renderFragment) {
   let refs = renderFragment.refs;
   for (let index = path.length - 1; index >= 0; --index) {
+    if (path[index] === ".")
+      continue;
     refs = mkRefsTree([], { [path[index]]: refs }, refs.repeated);
   }
   return new RenderFragment(
@@ -773,25 +849,34 @@ function mkRef(ref, originalName, constName, repeated, autoRef, viewStateType, e
   };
 }
 class RenderFragment {
-  constructor(rendered, imports = Imports.none(), validations = [], refs = mkRefsTree([], {})) {
+  constructor(rendered, imports = Imports.none(), validations = [], refs = mkRefsTree([], {}), recursiveRegions = []) {
     __publicField(this, "rendered");
     __publicField(this, "imports");
     __publicField(this, "validations");
     __publicField(this, "refs");
+    __publicField(this, "recursiveRegions");
     this.rendered = rendered;
     this.imports = imports;
     this.validations = validations;
     this.refs = refs;
+    this.recursiveRegions = recursiveRegions;
   }
   map(f) {
-    return new RenderFragment(f(this.rendered), this.imports, this.validations, this.refs);
+    return new RenderFragment(
+      f(this.rendered),
+      this.imports,
+      this.validations,
+      this.refs,
+      this.recursiveRegions
+    );
   }
   plusImport(imp) {
     return new RenderFragment(
       this.rendered,
       this.imports.plus(imp),
       this.validations,
-      this.refs
+      this.refs,
+      this.recursiveRegions
     );
   }
   static empty() {
@@ -804,7 +889,8 @@ class RenderFragment {
       rendered,
       Imports.merge(fragment1.imports, fragment2.imports),
       [...fragment1.validations, ...fragment2.validations],
-      newRefsTree
+      newRefsTree,
+      [...fragment1.recursiveRegions, ...fragment2.recursiveRegions]
     );
   }
 }
@@ -850,6 +936,14 @@ function removeComments(code) {
     (line) => !(line.includes("// @ts-expect-error ") || line.includes("// @ts-ignore") || line.includes("{/* @ts-ignore */}"))
   ).join("\n");
 }
+const s = createRequire(import.meta.url), e = s("typescript"), u = e, c = new Proxy(e, {
+  get(t, r) {
+    return t[r];
+  }
+});
+function i(t) {
+  return e[t];
+}
 export {
   CSS_EXTENSION,
   GenerateTarget,
@@ -882,10 +976,13 @@ export {
   JayElementConstructorType,
   JayElementType,
   JayEnumType,
+  JayErrorType,
   JayHTMLType,
   JayImportedType,
   JayNumber,
   JayObjectType,
+  JayPromiseType,
+  JayRecursiveType,
   JayString,
   JayTypeAlias,
   JayTypeKind,
@@ -907,18 +1004,23 @@ export {
   getMode,
   getModeFileExtension,
   getModeFromExtension,
+  i as getTs,
   hasExtension,
   hasJayModeExtension,
   hasRefs,
   isArrayType,
   isAtomicType,
   isComponentType,
+  isCurrencyType,
+  isDateWithTimezoneType,
   isElementConstructorType,
   isElementType,
   isEnumType,
   isHTMLType,
   isImportedType,
   isObjectType,
+  isPromiseType,
+  isRecursiveType,
   isTypeAliasType,
   isUnionType,
   mergeRefsTrees,
@@ -929,6 +1031,8 @@ export {
   prettifyHtml,
   removeComments,
   resolvePrimitiveType,
+  u as ts,
+  c as tsBridge,
   withOriginalTrace,
   withoutExtension
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jay-framework/compiler-shared",
-  "version": "0.6.10",
+  "version": "0.7.0",
   "type": "module",
   "description": "",
   "license": "Apache-2.0",
@@ -25,9 +25,10 @@
   },
   "author": "",
   "dependencies": {
-    "@jay-framework/component": "^0.6.10",
-    "@jay-framework/runtime": "^0.6.10",
-    "@jay-framework/secure": "^0.6.10",
+    "@jay-framework/component": "^0.7.0",
+    "@jay-framework/runtime": "^0.7.0",
+    "@jay-framework/secure": "^0.7.0",
+    "@jay-framework/typescript-bridge": "^0.2.0",
     "@types/js-yaml": "^4.0.9",
     "change-case": "^4.1.2",
     "js-beautify": "^1.14.11",
@@ -40,7 +41,7 @@
   },
   "devDependencies": {
     "@caiogondim/strip-margin": "^1.0.0",
-    "@jay-framework/dev-environment": "^0.6.10",
+    "@jay-framework/dev-environment": "^0.7.0",
     "@testing-library/jest-dom": "^6.2.0",
     "@types/js-beautify": "^1",
     "@types/node": "^20.11.5",