@aeriajs/compiler 0.0.32 → 0.0.34

package/dist/codegen/generateJSCollections.js

@@ -10,6 +10,8 @@ const generateJSCollections = (ast) => {
     let javascriptCode = '';
     const importsResult = (0, utils_js_1.makeASTImports)(ast, {
         [utils_js_1.PACKAGE_NAME]: new Set(initialImportedFunctions),
+    }, {
+        includeRuntimeOnlyImports: true,
     });
     javascriptCode += importsResult.code.join('\n') + '\n\n';
     javascriptCode += makeJSCollections(ast, importsResult.modifiedSymbols) + '\n\n';

package/dist/codegen/generateJSCollections.mjs

@@ -8,6 +8,8 @@ export const generateJSCollections = (ast) => {
   let javascriptCode = "";
   const importsResult = makeASTImports(ast, {
     [PACKAGE_NAME]: new Set(initialImportedFunctions)
+  }, {
+    includeRuntimeOnlyImports: true
   });
   javascriptCode += importsResult.code.join("\n") + "\n\n";
   javascriptCode += makeJSCollections(ast, importsResult.modifiedSymbols) + "\n\n";

package/dist/codegen/generateTSCollections.js

@@ -66,6 +66,11 @@ const makeTSCollectionSchema = (collectionNode, collectionId) => {
             case 'owned':
                 collectionSchema.description.owned = collectionNode[key];
                 break;
+            case 'middlewares':
+                collectionSchema.middlewares = {
+                    [utils_js_1.UnquotedSymbol]: 'import(\'@aeriajs/types\').CollectionMiddleware<unknown>[]',
+                };
+                break;
             case 'functions':
                 collectionSchema.functions = makeTSFunctions(collectionNode[key]);
                 collectionSchema.exposedFunctions = (0, utils_js_1.getExposedFunctions)(collectionNode[key]);

package/dist/codegen/generateTSCollections.mjs

@@ -61,6 +61,11 @@ const makeTSCollectionSchema = (collectionNode, collectionId) => {
       case "owned":
         collectionSchema.description.owned = collectionNode[key];
         break;
+      case "middlewares":
+        collectionSchema.middlewares = {
+          [UnquotedSymbol]: "import('@aeriajs/types').CollectionMiddleware<unknown>[]"
+        };
+        break;
       case "functions":
         collectionSchema.functions = makeTSFunctions(collectionNode[key]);
         collectionSchema.exposedFunctions = getExposedFunctions(collectionNode[key]);

package/dist/codegen/utils.d.ts

@@ -10,7 +10,9 @@ export declare const getExposedFunctions: (astFunctions: NonNullable<AST.Collect
 /**
  * Obs: It will save and return any modified symbols to avoid name duplication later
 */
-export declare const makeASTImports: (ast: AST.Node[], initialImports?: Record<string, Set<string>>) => {
+export declare const makeASTImports: (ast: AST.Node[], initialImports?: Record<string, Set<string>>, options?: {
+    includeRuntimeOnlyImports: boolean;
+}) => {
     code: string[];
     modifiedSymbols: Record<string, string>;
 };

package/dist/codegen/utils.js

@@ -25,7 +25,9 @@ exports.getExposedFunctions = getExposedFunctions;
 /**
  * Obs: It will save and return any modified symbols to avoid name duplication later
 */
-const makeASTImports = (ast, initialImports) => {
+const makeASTImports = (ast, initialImports, options = {
+    includeRuntimeOnlyImports: false,
+}) => {
     const modifiedSymbols = {};
     const toImport = ast.reduce((imports, node) => {
         if (node.kind === 'collection') {
@@ -46,10 +48,12 @@ const makeASTImports = (ast, initialImports) => {
                     }
                 }
             }
-            if (node.middlewares) {
-                imports[exports.MIDDLEWARES_RUNTIME_PATH] ??= new Set();
-                for (const middleware of node.middlewares) {
-                    imports[exports.MIDDLEWARES_RUNTIME_PATH].add(middleware);
+            if (options.includeRuntimeOnlyImports) {
+                if (node.middlewares) {
+                    imports[exports.MIDDLEWARES_RUNTIME_PATH] ??= new Set();
+                    for (const middleware of node.middlewares) {
+                        imports[exports.MIDDLEWARES_RUNTIME_PATH].add(middleware);
+                    }
                 }
             }
         }

package/dist/codegen/utils.mjs

@@ -19,7 +19,9 @@ export const getExposedFunctions = (astFunctions) => {
     value.accessCondition
   ]));
 };
-export const makeASTImports = (ast, initialImports) => {
+export const makeASTImports = (ast, initialImports, options = {
+  includeRuntimeOnlyImports: false
+}) => {
   const modifiedSymbols = {};
   const toImport = ast.reduce((imports, node) => {
     if (node.kind === "collection") {
@@ -40,10 +42,12 @@ export const makeASTImports = (ast, initialImports) => {
           }
         }
       }
-      if (node.middlewares) {
-        imports[MIDDLEWARES_RUNTIME_PATH] ??= /* @__PURE__ */ new Set();
-        for (const middleware of node.middlewares) {
-          imports[MIDDLEWARES_RUNTIME_PATH].add(middleware);
+      if (options.includeRuntimeOnlyImports) {
+        if (node.middlewares) {
+          imports[MIDDLEWARES_RUNTIME_PATH] ??= /* @__PURE__ */ new Set();
+          for (const middleware of node.middlewares) {
+            imports[MIDDLEWARES_RUNTIME_PATH].add(middleware);
+          }
         }
       }
     }

package/dist/parser.js

@@ -713,13 +713,10 @@ const parse = (tokens) => {
                     case 'required': {
                         node.required = parseArrayBlockWithAttributes(['if'], (attributeName, array, identifier) => {
                             switch (attributeName) {
-                                /* eslint-disable-next-line */
                                 case 'if': {
-                                    consume(token_js_1.TokenType.LeftParens);
                                     const ifTerms = [];
                                     array[identifier] = parseCondition(ifTerms);
                                     node[AST.LOCATION_SYMBOL].requiredTerms = ifTerms;
-                                    consume(token_js_1.TokenType.RightParens);
                                     break;
                                 }
                             }
@@ -816,7 +813,6 @@ const parse = (tokens) => {
                 if (match(token_js_1.TokenType.MacroName)) {
                     const { value: macroName } = consume(token_js_1.TokenType.MacroName, ['include']);
                     switch (macroName) {
-                        /* eslint-disable-next-line */
                         case 'include': {
                             const { value: functionSetName, location } = consume(token_js_1.TokenType.Identifier);
                             const functionset = ast.functionsets.find((node) => node.name === functionSetName);

package/dist/parser.mjs

@@ -660,11 +660,9 @@ export const parse = (tokens) => {
             node.required = parseArrayBlockWithAttributes(["if"], (attributeName, array, identifier) => {
               switch (attributeName) {
                 case "if": {
-                  consume(TokenType.LeftParens);
                   const ifTerms = [];
                   array[identifier] = parseCondition(ifTerms);
                   node[AST.LOCATION_SYMBOL].requiredTerms = ifTerms;
-                  consume(TokenType.RightParens);
                   break;
                 }
               }

package/dist/semantic.js

@@ -41,10 +41,10 @@ const AST = __importStar(require("./ast.js"));
 const collectionHasProperty = async (collection, propName, options) => {
     let hasProperty = propName in collection.properties;
     if (!hasProperty) {
-        if (options.languageServer) {
-            return true;
-        }
         if (collection.extends) {
+            if (options.languageServer) {
+                return true;
+            }
             const { packageName, symbolName } = collection.extends;
             const { [symbolName]: importedCollection } = await Promise.resolve(`${packageName}`).then(s => __importStar(require(s)));
             if (!(0, common_1.isValidCollection)(importedCollection)) {

package/dist/semantic.mjs

@@ -6,10 +6,10 @@ import * as AST from "./ast.mjs";
 const collectionHasProperty = async (collection, propName, options) => {
   let hasProperty = propName in collection.properties;
   if (!hasProperty) {
-    if (options.languageServer) {
-      return true;
-    }
     if (collection.extends) {
+      if (options.languageServer) {
+        return true;
+      }
       const { packageName, symbolName } = collection.extends;
       const { [symbolName]: importedCollection } = await import(packageName);
       if (!isValidCollection(importedCollection)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aeriajs/compiler",
-  "version": "0.0.32",
+  "version": "0.0.34",
   "description": "",
   "main": "dist/index.js",
   "module": "dist/index.mjs",