@jay-framework/compiler-analyze-exported-types 0.6.7 → 0.6.8

package/dist/index.js

@@ -1,9 +1,8 @@
-"use strict";
-Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const fs = require("fs");
-const path = require("path");
-const ts = require("typescript");
-const compilerShared = require("@jay-framework/compiler-shared");
+import fs from "fs";
+import { createRequire } from "module";
+import path from "path";
+import ts from "typescript";
+import { JayUnknown, JayElementType, JayObjectType, JayElementConstructorType, JayComponentApiMember, JayComponentType, resolvePrimitiveType, JayArrayType, JAY_COMPONENT, MAKE_JAY_COMPONENT } from "@jay-framework/compiler-shared";
 function resolveTsConfig(options) {
   const tsConfigPath = path.resolve(process.cwd(), options.relativePath || "tsconfig.json");
   if (!ts.sys.fileExists(tsConfigPath)) {
@@ -15,27 +14,48 @@ function resolveTsConfig(options) {
   }
   return tsConfigPath;
 }
+const require2 = createRequire(import.meta.url);
+const tsModule = require2("typescript");
+const {
+  convertCompilerOptionsFromJson,
+  createProgram,
+  isCallExpression,
+  isFunctionDeclaration,
+  isIdentifier,
+  isImportDeclaration,
+  isInterfaceDeclaration,
+  isNamedImports,
+  isPropertySignature,
+  isQualifiedName,
+  isStringLiteral,
+  isTypeAliasDeclaration,
+  isTypeReferenceNode,
+  isVariableStatement,
+  parseConfigFileTextToJson,
+  SyntaxKind
+} = tsModule;
 function getTypeName(typeName) {
-  if (ts.isIdentifier(typeName))
+  if (isIdentifier(typeName))
     return typeName.text;
-  else if (ts.isQualifiedName(typeName))
+  else if (isQualifiedName(typeName))
     return `${getTypeName(typeName.left)}.${typeName.right.text}`;
+  return "";
 }
 function getJayType(typeNode, types) {
-  let propType = compilerShared.resolvePrimitiveType(typeNode.getText());
-  if (propType === compilerShared.JayUnknown && ts.isTypeReferenceNode(typeNode)) {
+  let propType = resolvePrimitiveType(typeNode.getText());
+  if (propType === JayUnknown && isTypeReferenceNode(typeNode)) {
     const typeName = getTypeName(typeNode.typeName);
     if (typeName === "Array" && typeNode.typeArguments.length > 0)
-      propType = new compilerShared.JayArrayType(getJayType(typeNode.typeArguments[0], types));
+      propType = new JayArrayType(getJayType(typeNode.typeArguments[0], types));
     else
-      propType = types.find((_) => _.name === getTypeName(typeNode.typeName)) ?? compilerShared.JayUnknown;
+      propType = types.find((_) => _.name === getTypeName(typeNode.typeName)) ?? JayUnknown;
   }
   return propType;
 }
 function getInterfaceJayType(interfaceDeclaration, types) {
   let props = {};
-  const jayObjectType = new compilerShared.JayObjectType(interfaceDeclaration.name.text, props);
-  interfaceDeclaration.members.filter((member) => ts.isPropertySignature(member) && ts.isIdentifier(member.name)).forEach((member) => {
+  const jayObjectType = new JayObjectType(interfaceDeclaration.name.text, props);
+  interfaceDeclaration.members.filter((member) => isPropertySignature(member) && isIdentifier(member.name)).forEach((member) => {
     let property = member;
     let name = member.name;
     let propKey = name.text;
@@ -44,7 +64,7 @@ function getInterfaceJayType(interfaceDeclaration, types) {
   return jayObjectType;
 }
 function getElementConstructorType(name, typeName) {
-  return new compilerShared.JayElementConstructorType(name, typeName);
+  return new JayElementConstructorType(name, typeName);
 }
 function getComponentType(tsTypeChecker, name, componentType) {
   let properties = componentType.getProperties();
@@ -55,12 +75,12 @@ function getComponentType(tsTypeChecker, name, componentType) {
       ;
     else {
       if (type.getSymbol().getName() === "EventEmitter")
-        componentAPIs.push(new compilerShared.JayComponentApiMember(property.getName(), true));
+        componentAPIs.push(new JayComponentApiMember(property.getName(), true));
       else
-        componentAPIs.push(new compilerShared.JayComponentApiMember(property.getName(), false));
+        componentAPIs.push(new JayComponentApiMember(property.getName(), false));
     }
   }
-  return new compilerShared.JayComponentType(name, componentAPIs);
+  return new JayComponentType(name, componentAPIs);
 }
 function autoAddExtension(filename) {
   if (fs.existsSync(filename + ".ts"))
@@ -93,32 +113,32 @@ const JayComponentProperties = {
 function loadTSCompilerOptions(options = {}) {
   let tsConfigPath = resolveTsConfig(options);
   let loadedTSConfig = fs.readFileSync(tsConfigPath, "utf8");
-  let tsConfig = ts.parseConfigFileTextToJson("tsconfig.json", loadedTSConfig);
-  return ts.convertCompilerOptionsFromJson(tsConfig.config.compilerOptions, tsConfigPath).options;
+  let tsConfig = parseConfigFileTextToJson("tsconfig.json", loadedTSConfig);
+  return convertCompilerOptionsFromJson(tsConfig.config.compilerOptions, tsConfigPath).options;
 }
 function isExportedStatement(statement) {
   return Boolean(
     statement.modifiers && statement.modifiers.find(
-      (_) => _.kind === ts.SyntaxKind.ExportKeyword
+      (_) => _.kind === SyntaxKind.ExportKeyword
     )
   );
 }
 const SYMBOLS = {
-  MAKE_JAY_COMPONENT: { module: compilerShared.JAY_COMPONENT, namedImport: compilerShared.MAKE_JAY_COMPONENT }
+  MAKE_JAY_COMPONENT: { module: JAY_COMPONENT, namedImport: MAKE_JAY_COMPONENT }
 };
-function findImportedSymbol(module2, namedImport) {
+function findImportedSymbol(module, namedImport) {
   return Object.values(SYMBOLS).find(
-    (importedSymbol) => importedSymbol.module === module2 && importedSymbol.namedImport == namedImport
+    (importedSymbol) => importedSymbol.module === module && importedSymbol.namedImport == namedImport
   );
 }
 function mapImportedSymbols(statements, tsTypeChecker) {
-  statements.filter(ts.isImportDeclaration).forEach((importDeclaration) => {
-    if (ts.isStringLiteral(importDeclaration.moduleSpecifier) && importDeclaration.importClause?.namedBindings) {
-      const module2 = importDeclaration.moduleSpecifier.text;
-      if (ts.isNamedImports(importDeclaration.importClause.namedBindings)) {
+  statements.filter(isImportDeclaration).forEach((importDeclaration) => {
+    if (isStringLiteral(importDeclaration.moduleSpecifier) && importDeclaration.importClause?.namedBindings) {
+      const module = importDeclaration.moduleSpecifier.text;
+      if (isNamedImports(importDeclaration.importClause.namedBindings)) {
         importDeclaration.importClause.namedBindings.elements.forEach((namedImport) => {
           const name = namedImport.name.text;
-          const importedSymbol = findImportedSymbol(module2, name);
+          const importedSymbol = findImportedSymbol(module, name);
           if (importedSymbol)
             importedSymbol.symbol = tsTypeChecker.getTypeAtLocation(namedImport).symbol;
         });
@@ -130,15 +150,15 @@ function mapImportedSymbols(statements, tsTypeChecker) {
 function analyzeExportedTypes(filename, options = {}) {
   let compilerOptions = loadTSCompilerOptions(options);
   filename = autoAddExtension(filename);
-  const program = ts.createProgram([filename], compilerOptions);
+  const program = createProgram([filename], compilerOptions);
   const sourceFile = program.getSourceFile(filename);
   const tsTypeChecker = program.getTypeChecker();
   const types = [];
   const { MAKE_JAY_COMPONENT: MAKE_JAY_COMPONENT2 } = mapImportedSymbols(sourceFile.statements, tsTypeChecker);
   for (const statement of sourceFile.statements.filter(isExportedStatement)) {
-    if (ts.isInterfaceDeclaration(statement)) {
+    if (isInterfaceDeclaration(statement)) {
       types.push(getInterfaceJayType(statement, types));
-    } else if (ts.isFunctionDeclaration(statement)) {
+    } else if (isFunctionDeclaration(statement)) {
       const functionType = tsTypeChecker.getTypeAtLocation(statement.type);
       if (functionType.symbol || functionType.aliasSymbol) {
         const typeName = functionType.symbol?.name;
@@ -149,14 +169,14 @@ function analyzeExportedTypes(filename, options = {}) {
         } else if (isOrSubclassOf(functionType, "JayComponent")) {
           types.push(getComponentType(tsTypeChecker, functionName, functionType));
         } else
-          types.push(compilerShared.JayUnknown);
+          types.push(JayUnknown);
       }
-    } else if (ts.isTypeAliasDeclaration(statement)) {
-      if (ts.isTypeReferenceNode(statement.type) && ts.isIdentifier(statement.type.typeName) && statement.type.typeName.text === "JayElement")
-        types.push(new compilerShared.JayElementType(statement.name.text));
-    } else if (ts.isVariableStatement(statement)) {
+    } else if (isTypeAliasDeclaration(statement)) {
+      if (isTypeReferenceNode(statement.type) && isIdentifier(statement.type.typeName) && statement.type.typeName.text === "JayElement")
+        types.push(new JayElementType(statement.name.text));
+    } else if (isVariableStatement(statement)) {
       statement.declarationList.declarations.forEach((declaration) => {
-        if (ts.isCallExpression(declaration.initializer) && ts.isIdentifier(declaration.name)) {
+        if (isCallExpression(declaration.initializer) && isIdentifier(declaration.name)) {
           const functionType = tsTypeChecker.getTypeAtLocation(
             declaration.initializer.expression
           );
@@ -172,9 +192,11 @@ function analyzeExportedTypes(filename, options = {}) {
         }
       });
     } else
-      types.push(compilerShared.JayUnknown);
+      types.push(JayUnknown);
   }
   return types;
 }
-exports.analyzeExportedTypes = analyzeExportedTypes;
-exports.resolveTsConfig = resolveTsConfig;
+export {
+  analyzeExportedTypes,
+  resolveTsConfig
+};

package/package.json

@@ -1,9 +1,10 @@
 {
   "name": "@jay-framework/compiler-analyze-exported-types",
-  "version": "0.6.7",
+  "version": "0.6.8",
   "description": "",
   "license": "Apache-2.0",
   "main": "dist/index.js",
+  "type": "module",
   "directories": {
     "lib": "lib"
   },
@@ -24,10 +25,10 @@
   },
   "author": "",
   "dependencies": {
-    "@jay-framework/compiler-shared": "^0.6.7",
-    "@jay-framework/component": "^0.6.7",
-    "@jay-framework/runtime": "^0.6.7",
-    "@jay-framework/secure": "^0.6.7",
+    "@jay-framework/compiler-shared": "^0.6.8",
+    "@jay-framework/component": "^0.6.8",
+    "@jay-framework/runtime": "^0.6.8",
+    "@jay-framework/secure": "^0.6.8",
     "@types/js-yaml": "^4.0.9",
     "change-case": "^4.1.2",
     "js-yaml": "^4.1.0",
@@ -37,7 +38,7 @@
   },
   "devDependencies": {
     "@caiogondim/strip-margin": "^1.0.0",
-    "@jay-framework/dev-environment": "^0.6.7",
+    "@jay-framework/dev-environment": "^0.6.8",
     "@testing-library/jest-dom": "^6.2.0",
     "@types/js-beautify": "^1",
     "@types/node": "^20.11.5",