@jay-framework/compiler 0.23.0 → 0.23.1

package/dist/index.d.ts

@@ -201,7 +201,7 @@ declare class SourceFileStatementDependencies {
     constructor(sourceFile: ts.SourceFile, bindingResolver: SourceFileBindingResolver);
     getDependsOn(statement: ts.Statement): Set<StatementDependencies>;
     getIsDependencyFor(statement: ts.Statement): Set<StatementDependencies>;
-    getAllStatements(): IterableIterator<StatementDependencies>;
+    getAllStatements(): MapIterator<StatementDependencies>;
     getStatementDependencies(statement: ts.Statement): StatementDependencies;
 }
 

package/dist/index.js

@@ -1,9 +1,6 @@
 var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField = (obj, key, value) => {
-  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-  return value;
-};
+var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 import { JAY_COMPONENT, WithValidations, getModeFileExtension, MAKE_JAY_COMPONENT, JAY_SECURE, RuntimeMode, withOriginalTrace, JAY_QUERY_WORKER_TRUSTED, hasExtension, JAY_QUERY_MAIN_SANDBOX, JAY_QUERY_WORKER_SANDBOX, JayUnknown, JAY_EXTENSION, withoutExtension, JAY_TS_EXTENSION, SourceFileFormat, GenerateTarget } from "@jay-framework/compiler-shared";
 import { createRequire } from "module";
 import { capitalCase } from "change-case";
@@ -104,8 +101,7 @@ function findComponentConstructorsBlock(componentFunctionExpressions, sourceFile
   );
   function visit(node) {
     if (isFunctionDeclaration$2(node)) {
-      if (namedConstructors.has(node?.name.text))
-        foundConstructors.push(node);
+      if (namedConstructors.has(node?.name.text)) foundConstructors.push(node);
     } else if (isVariableStatement$3(node)) {
       node.declarationList.declarations.forEach((declaration) => {
         if (isIdentifier$a(declaration.name) && namedConstructors.has(declaration.name.text) && declaration.initializer && isArrowFunction$3(declaration.initializer))
@@ -211,12 +207,9 @@ const getAccessedByProperty = (binding, accessedFrom, propertyName) => {
   return accessedFrom ? propertyName ? isIdentifier$9(propertyName) ? propertyName.text : void 0 : binding.text : void 0;
 };
 function findDeclaringStatement(node) {
-  if (!node)
-    return void 0;
-  else if (isStatement$3(node))
-    return node;
-  else
-    return findDeclaringStatement(node.parent);
+  if (!node) return void 0;
+  else if (isStatement$3(node)) return node;
+  else return findDeclaringStatement(node.parent);
 }
 function tsBindingNameToVariable(binding, accessedFrom, assignedFrom, propertyName, root) {
   if (isIdentifier$9(binding)) {
@@ -275,8 +268,7 @@ class NameBindingResolver {
         mkParameterVariableRoot(param, paramIndex)
       );
       paramVariables.forEach((variable) => {
-        if (variable.name)
-          this.variables.set(variable.name, variable);
+        if (variable.name) this.variables.set(variable.name, variable);
       });
     });
   }
@@ -377,8 +369,7 @@ class NameBindingResolver {
     let resolved;
     while ((resolved = nameResolver.getVariable(variableName)) === UNKNOWN_VARIABLE && nameResolver.parentNameResolver)
       nameResolver = nameResolver.parentNameResolver;
-    if (resolved === UNKNOWN_VARIABLE)
-      return { root: mkGlobalVariableRoot(variableName) };
+    if (resolved === UNKNOWN_VARIABLE) return { root: mkGlobalVariableRoot(variableName) };
     return resolved;
   }
   addImportDeclaration(node) {
@@ -429,8 +420,7 @@ class NameBindingResolver {
   }
 }
 function flattenVariable(variable, path2 = []) {
-  if (variable.assignedFrom)
-    return flattenVariable(variable.assignedFrom, path2);
+  if (variable.assignedFrom) return flattenVariable(variable.assignedFrom, path2);
   else if (variable.accessedFrom) {
     return flattenVariable(variable.accessedFrom, [variable.accessedByProperty, ...path2]);
   } else if (variable.properties && !!variable.properties.find((_) => _.name === path2[0])) {
@@ -438,8 +428,7 @@ function flattenVariable(variable, path2 = []) {
       variable.properties.find((_) => _.name === path2[0]),
       path2.slice(1)
     );
-  } else
-    return { path: path2, root: variable.root };
+  } else return { path: path2, root: variable.root };
 }
 const { isIdentifier: isIdentifier$8, isPropertyAccessExpression: isPropertyAccessExpression$4 } = c;
 function isIdentifierOrPropertyAccessExpression(node) {
@@ -564,12 +553,8 @@ class UnionResolvedType {
     if (rightSide instanceof UnionResolvedType) {
       for (const item1 of this.types)
         for (const item2 of rightSide.types)
-          if (item1.canBeAssignedFrom(item2))
-            return true;
-    } else
-      for (const item1 of this.types)
-        if (item1.canBeAssignedFrom(rightSide))
-          return true;
+          if (item1.canBeAssignedFrom(item2)) return true;
+    } else for (const item1 of this.types) if (item1.canBeAssignedFrom(rightSide)) return true;
     return false;
   }
 }
@@ -605,15 +590,11 @@ class SourceFileBindingResolver {
       return node;
     };
     const visitor = (node) => {
-      if (isFunctionDeclaration$1(node))
-        nbResolversQueue[0].addFunctionDeclaration(node);
-      if (isVariableStatement$2(node))
-        nbResolversQueue[0].addVariableStatement(node);
-      else if (isImportDeclaration$3(node))
-        nbResolversQueue[0].addImportDeclaration(node);
-      else if (isBlock$2(node))
-        return doWithChildBindingResolver(node, () => {
-        });
+      if (isFunctionDeclaration$1(node)) nbResolversQueue[0].addFunctionDeclaration(node);
+      if (isVariableStatement$2(node)) nbResolversQueue[0].addVariableStatement(node);
+      else if (isImportDeclaration$3(node)) nbResolversQueue[0].addImportDeclaration(node);
+      else if (isBlock$2(node)) return doWithChildBindingResolver(node, () => {
+      });
       else if (isFunctionLikeDeclarationBase(node)) {
         return doWithChildBindingResolver(
           node,
@@ -646,8 +627,7 @@ class SourceFileBindingResolver {
   }
   findBindingResolver(node) {
     let found;
-    while (!(found = this.nameBindingResolvers.get(node)) && node.parent)
-      node = node.parent;
+    while (!(found = this.nameBindingResolvers.get(node)) && node.parent) node = node.parent;
     return found;
   }
   explain(identifier) {
@@ -658,8 +638,7 @@ class SourceFileBindingResolver {
       if (isImportModuleVariableRoot(flattened.root) && isStringLiteral$7(flattened.root.module)) {
         return new ImportFromModuleResolvedType(flattened.root.module.text, flattened.path);
       }
-    } else
-      return void 0;
+    } else return void 0;
   }
   explainType(type) {
     if (type) {
@@ -669,10 +648,8 @@ class SourceFileBindingResolver {
           let resolved = this.findBindingResolver(typeName).resolveIdentifier(typeName);
           let flattened = flattenVariable(resolved);
           let typeFromFlattened = this.explainFlattenedVariableType(flattened);
-          if (typeFromFlattened)
-            return typeFromFlattened;
-          if (builtInType(typeName.text))
-            return new BuiltInResolvedType(typeName.text);
+          if (typeFromFlattened) return typeFromFlattened;
+          if (builtInType(typeName.text)) return new BuiltInResolvedType(typeName.text);
         }
       } else if (type.kind === SyntaxKind$4.StringKeyword)
         return new BuiltInResolvedType("string");
@@ -680,10 +657,8 @@ class SourceFileBindingResolver {
         return new BuiltInResolvedType("number");
       else if (type.kind === SyntaxKind$4.BooleanKeyword)
         return new BuiltInResolvedType("boolean");
-      else if (type.kind === SyntaxKind$4.AnyKeyword)
-        return new BuiltInResolvedType("any");
-      else if (type.kind === SyntaxKind$4.VoidKeyword)
-        return new BuiltInResolvedType("void");
+      else if (type.kind === SyntaxKind$4.AnyKeyword) return new BuiltInResolvedType("any");
+      else if (type.kind === SyntaxKind$4.VoidKeyword) return new BuiltInResolvedType("void");
       else if (isArrayTypeNode(type))
         return new ArrayResolvedType(this.explainType(type.elementType));
       else if (isFunctionTypeNode(type)) {
@@ -728,8 +703,7 @@ var CompilePatternType = /* @__PURE__ */ ((CompilePatternType2) => {
   return CompilePatternType2;
 })(CompilePatternType || {});
 function areCompatiblePatternTypes(type1, type2) {
-  if (type1 === type2)
-    return true;
+  if (type1 === type2) return true;
   if (type1 === 1 && type2 === 2)
     return true;
   return type1 === 2 && type2 === 1;
@@ -744,12 +718,10 @@ var JayTargetEnv = /* @__PURE__ */ ((JayTargetEnv2) => {
   return JayTargetEnv2;
 })(JayTargetEnv || {});
 function intersectJayTargetEnv(a, b) {
-  if (a === b && a === 1)
-    return 1;
+  if (a === b && a === 1) return 1;
   if (a === 0 && b === 0 || a === 0 && b === 1 || a === 1 && b === 0)
     return 0;
-  else
-    return 2;
+  else return 2;
 }
 function extractArgumentType(argument, sourceFileBinding, node) {
   if (isIdentifierOrPropertyAccessExpression(argument)) {
@@ -876,19 +848,15 @@ function visitWithContext(node, initialContext, contextualVisitor) {
 function visitWithContext2(node, initialContext, transformationContext, contextualVisitor) {
   let contexts = [initialContext];
   const visitChild = (node2, childContext) => {
-    if (childContext)
-      contexts.push(childContext);
+    if (childContext) contexts.push(childContext);
     let visitedNode = visitNode$3(node2, visitor);
-    if (childContext)
-      contexts.pop();
+    if (childContext) contexts.pop();
     return visitedNode;
   };
   const _visitEachChild = (node2, childContext) => {
-    if (childContext)
-      contexts.push(childContext);
+    if (childContext) contexts.push(childContext);
     let visitedNode = visitEachChild$3(node2, visitor, transformationContext);
-    if (childContext)
-      contexts.pop();
+    if (childContext) contexts.pop();
     return visitedNode;
   };
   const visitor = (node2) => {
@@ -946,8 +914,7 @@ ${returnedObjectProperties.length > 0 ? `	return ({${returnedObjectProperties}})
   if (matchedReturnPatterns.length > 0) {
     let handlerCode = `({ event }: JayEvent<any, any>) => ({${returnedObjectProperties}})`;
     return { handlerCode, key: constCode };
-  } else
-    return { key: void 0, handlerCode: void 0 };
+  } else return { key: void 0, handlerCode: void 0 };
 }
 const mkTransformEventHandlerStatementVisitor = (factory, context, bindingResolver, analyzer) => {
   let sideEffects = {
@@ -1016,8 +983,7 @@ const mkTransformEventHandlerStatementVisitor = (factory, context, bindingResolv
             sideEffects.matchedConstants.push(`const ${node.text} = ${constantValue}`);
           }
           return node;
-        } else
-          return node;
+        } else return node;
         let replacementPattern = `event.$${patternKey}`;
         sideEffects.wasEventHandlerTransformed = true;
         return codeToAst(replacementPattern, context)[0].expression;
@@ -1229,8 +1195,7 @@ class ScopedSourceFileStatementAnalyzer {
         targetEnv: JayTargetEnv.sandbox,
         matchedPatterns: []
       });
-    } else
-      this.analyzedStatements.get(statement).targetEnv = JayTargetEnv.sandbox;
+    } else this.analyzedStatements.get(statement).targetEnv = JayTargetEnv.sandbox;
   }
   analyze(analysisScope) {
     let RoleInParent;
@@ -1283,8 +1248,7 @@ class ScopedSourceFileStatementAnalyzer {
         isScopedVariableAccess = isParamVariableRoot(flattened.root) && isChildOf(flattened.root.param, analysisScope);
       }
       const paramMatching = patternTypeMatchArgumentType || isLiteral || isScopedVariableAccess;
-      if (!paramMatching)
-        this.markStatementSandbox(statement);
+      if (!paramMatching) this.markStatementSandbox(statement);
       return paramMatching;
     };
     const analyzeCallOrNewExpression = (node, visitChild, statement, roleInParent) => {
@@ -1317,8 +1281,7 @@ class ScopedSourceFileStatementAnalyzer {
             });
           this.markStatementSandbox(statement);
         }
-      } else
-        this.markStatementSandbox(statement);
+      } else this.markStatementSandbox(statement);
     };
     visitWithContext(
       this.sourceFile,
@@ -1327,8 +1290,7 @@ class ScopedSourceFileStatementAnalyzer {
         /* none */
       },
       (node, { statement, roleInParent }, visitChild) => {
-        if (isStatement$1(node))
-          statement = node;
+        if (isStatement$1(node)) statement = node;
         if (roleInParent === 1 || roleInParent === 2) {
           if (isIdentifierOrPropertyAccessExpression(node))
             analyzePropertyExpression(node, visitChild, statement, roleInParent);
@@ -1496,12 +1458,11 @@ class ScopedSourceFileStatementAnalyzer {
           matchType: 0
           /* FULL */
         };
-      else
-        return {
-          matchedPatterns: [],
-          matchType: 2
-          /* NONE */
-        };
+      else return {
+        matchedPatterns: [],
+        matchType: 2
+        /* NONE */
+      };
     }
     if (currentVariableType) {
       let currentPosition = 0;
@@ -1578,13 +1539,9 @@ class ScopedSourceFileStatementAnalyzer {
   }
 }
 function isChildOf(node, parent) {
-  if (node === parent)
-    return false;
-  if (!node.parent)
-    return false;
-  for (const sibling of node.parent.getChildren())
-    if (sibling === node)
-      return true;
+  if (node === parent) return false;
+  if (!node.parent) return false;
+  for (const sibling of node.parent.getChildren()) if (sibling === node) return true;
   return isChildOf(node.parent, parent);
 }
 const { isCallExpression: isCallExpression$1, isIdentifier: isIdentifier$2, isStringLiteral: isStringLiteral$6, isVariableStatement, forEachChild: forEachChild$1 } = c;
@@ -1648,15 +1605,13 @@ class FunctionRepositoryBuilder {
     __publicField(this, "nextIndex", 0);
   }
   addFunction(handlerCode) {
-    if (!handlerCode)
-      return void 0;
+    if (!handlerCode) return void 0;
     const key = `${this.nextIndex++}`;
     this.fragments.push({ key, handlerCode });
     return key;
   }
   addConst(constCode) {
-    if (!constCode)
-      return;
+    if (!constCode) return;
     this.consts.push(constCode);
   }
   generate() {
@@ -1712,10 +1667,8 @@ function analyzeGlobalExec$(context, analyzer, functionRepositoryBuilder, foundE
     }
     return node;
   };
-  if (isArrowFunction(foundExec$.arguments[0]))
-    visitNode$1(foundExec$.arguments[0].body, visitor);
-  if (foundUnsafeExpression)
-    return { foundExec$, wasTransformed: false };
+  if (isArrowFunction(foundExec$.arguments[0])) visitNode$1(foundExec$.arguments[0].body, visitor);
+  if (foundUnsafeExpression) return { foundExec$, wasTransformed: false };
   else {
     const key = functionRepositoryBuilder.addFunction(astToCode(foundExec$.arguments[0]));
     const transformedExec$ = codeToAst(`exec$(funcGlobal$('${key}'))`, context).map(
@@ -1745,8 +1698,7 @@ function generateComponentConstructorCalls(context, componentConstructorCalls, h
   if (transformedConstructors.length > 0) {
     let declarationCode = `export const ${transformedConstructors.join(", ")}`;
     return codeToAst(declarationCode, context)[0];
-  } else
-    return void 0;
+  } else return void 0;
 }
 function getRenderImportSpecifier(node) {
   const namedBindings = node.importClause?.namedBindings;
@@ -1775,10 +1727,8 @@ function transformImport(node, importerMode, context, hasFunctionRepository) {
         context
       )[0];
     }
-    if (node.moduleSpecifier.text === "@jay-framework/runtime")
-      return node;
-    if (node.moduleSpecifier.text.endsWith(".css") && !node.importClause)
-      return node;
+    if (node.moduleSpecifier.text === "@jay-framework/runtime") return node;
+    if (node.moduleSpecifier.text.endsWith(".css") && !node.importClause) return node;
     return void 0;
   }
   return void 0;
@@ -1791,12 +1741,10 @@ function transformSourceFile(sourceFile, factory, context, importerMode, compone
     hasFunctionRepository
   );
   let transformedStatements = sourceFile.statements.map((statement) => {
-    if (isInterfaceDeclaration(statement))
-      return statement;
+    if (isInterfaceDeclaration(statement)) return statement;
     else if (isImportDeclaration$2(statement))
       return transformImport(statement, importerMode, context, hasFunctionRepository);
-    else
-      return void 0;
+    else return void 0;
   }).filter((_) => !!_);
   const funcRepositoryStatements = hasFunctionRepository ? codeToAst(functionRepository, context) : [];
   let allStatements = [
@@ -1859,11 +1807,9 @@ function transformComponentBridge(importerMode, patterns = [], globalFunctionRep
 }
 const { isStringLiteral: isStringLiteral$3 } = c;
 function transformImportModeFileExtension(node, factory, importerMode) {
-  if (!isStringLiteral$3(node.moduleSpecifier))
-    return void 0;
+  if (!isStringLiteral$3(node.moduleSpecifier)) return void 0;
   const originalTarget = node.moduleSpecifier.text;
-  if (!isRelativeImport(originalTarget))
-    return node;
+  if (!isRelativeImport(originalTarget)) return node;
   return factory.updateImportDeclaration(
     node,
     node.modifiers,
@@ -1875,8 +1821,7 @@ function transformImportModeFileExtension(node, factory, importerMode) {
 const { isImportDeclaration: isImportDeclaration$1 } = c;
 function findAfterImportStatementIndex(statements) {
   let lastIndex = 0;
-  while (isImportDeclaration$1(statements[lastIndex]))
-    lastIndex += 1;
+  while (isImportDeclaration$1(statements[lastIndex])) lastIndex += 1;
   return lastIndex;
 }
 function transformComponentImports(needsHandler$, needsFunc$, needsFuncGlobal$, transformedSourceFile, context, factory, sourceFile) {
@@ -1897,8 +1842,7 @@ function transformComponentImports(needsHandler$, needsFunc$, needsFuncGlobal$,
       ...statements.slice(afterImportStatementIndex)
     ];
     return factory.updateSourceFile(sourceFile, allStatements);
-  } else
-    return transformedSourceFile;
+  } else return transformedSourceFile;
 }
 const { visitEachChild, transform, isStringLiteral: isStringLiteral$2, isImportDeclaration } = c;
 function isCssImport(node) {
@@ -1950,10 +1894,8 @@ function mkComponentTransformer(sftContext) {
       return visitEachChild(node, visitor, context);
     }
     if (isImportDeclaration(node)) {
-      if (isCssImport(node))
-        return void 0;
-      else
-        return transformImportModeFileExtension(node, factory, RuntimeMode.WorkerSandbox);
+      if (isCssImport(node)) return void 0;
+      else return transformImportModeFileExtension(node, factory, RuntimeMode.WorkerSandbox);
     }
     return visitEachChild(node, visitor, context);
   };
@@ -2064,8 +2006,7 @@ class SourceFileStatementDependencies {
         }
       }
       node.getChildren().forEach((child) => visitNode(child, visitor));
-      if (isStatement(node))
-        parents.pop();
+      if (isStatement(node)) parents.pop();
       return node;
     };
     visitNode(sourceFile, visitor);

package/package.json

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