@aeriajs/compiler 0.0.77 → 0.0.78

package/dist/codegen/generateJSCollections.js

@@ -4,15 +4,15 @@ const initialImportedFunctions = [
     'defineCollection',
 ];
 export const generateJSCollections = async (ast) => {
-    let javascriptCode = '';
+    let code = '';
     const importsResult = makeASTImports(ast.collections, {
         [PACKAGE_NAME]: new Set(initialImportedFunctions),
     }, {
         includeRuntimeOnlyImports: true,
     });
-    javascriptCode += importsResult.code.join('\n') + '\n\n';
-    javascriptCode += await makeJSCollections(ast, importsResult.aliasedSymbols) + '\n\n';
-    return javascriptCode;
+    code += importsResult.code.join('\n') + '\n\n';
+    code += await makeJSCollections(ast, importsResult.aliasedSymbols) + '\n\n';
+    return code;
 };
 const makeJSFunctions = async (collectionNode) => {
     let output = '';
@@ -36,16 +36,16 @@ const makeJSCollections = async (ast, aliasedSymbols) => {
     for (const collectionNode of ast.collections) {
         const id = getCollectionId(collectionNode.name);
         const extendCollectionName = getExtendName(collectionNode.name);
-        const collectionDefinition = `export const ${id} = ${collectionNode.extends
+        const collectionDeclaration = `export const ${id} = ${collectionNode.extends
             ? `extendCollection(${id in aliasedSymbols
                 ? aliasedSymbols[id]
                 : id}, ${await makeJSCollectionSchema(ast, collectionNode, id)})`
             : `defineCollection(${await makeJSCollectionSchema(ast, collectionNode, id)})`}`;
-        const collectionDeclaration = `export const ${extendCollectionName} = (collection) => extendCollection(${id}, collection)`;
+        const collectionExtendFunction = `export const ${extendCollectionName} = (collection) => extendCollection(${id}, collection)`;
         collectionCodes[collectionNode.name] = [
             '//' + collectionNode.name,
-            collectionDefinition,
             collectionDeclaration,
+            collectionExtendFunction,
         ].join('\n');
     }
     return Object.values(collectionCodes).join('\n\n');

package/dist/codegen/generateTSCollections.js

@@ -7,15 +7,15 @@ const initialImportedTypes = [
     'Context',
 ];
 const makeTSFunctions = (collectionNode) => {
-    const funs = {};
+    const functions = {};
     for (const functionNode of collectionNode.functions) {
-        funs[functionNode.name] = {
+        functions[functionNode.name] = {
             [UnquotedSymbol]: functionNode.exportSymbol
                 ? `typeof import('${functionNode.exportSymbol.importPath}').${functionNode.exportSymbol.symbolName}`
                 : 'unknown',
         };
     }
-    return funs;
+    return functions;
 };
 export const generateTSCollections = async (ast) => {
     let code = '';
@@ -38,7 +38,7 @@ const makeTSCollections = (ast, aliasedSymbols) => {
             : makeTSCollectionSchema(collectionNode, id)}`;
         const collectionDeclaration = `export declare const ${id}: ${typeName} & { item: SchemaWithId<${typeName}["description"]> }`;
         const collectionSchema = `export declare type ${schemaName} = SchemaWithId<typeof ${id}.description>`;
-        const collectionExtend = `export declare const extend${schemaName}Collection: <
+        const collectionExtendFunction = `export declare const extend${schemaName}Collection: <
             const TCollection extends {
               [P in Exclude<keyof Collection, "functions">]?: Partial<Collection[P]>
             } & {
@@ -51,7 +51,7 @@ const makeTSCollections = (ast, aliasedSymbols) => {
             collectionType,
             collectionDeclaration,
             collectionSchema,
-            collectionExtend,
+            collectionExtendFunction,
         ].join('\n');
     }
     return Object.values(collectionCodes).join('\n\n');

package/dist/parser.js

@@ -718,7 +718,7 @@ export const parse = (tokens) => {
                     case 'required': {
                         const { value, symbols } = parseArrayBlockWithAttributes(['if'], (attributeName, array, identifier) => {
                             switch (attributeName) {
-                                case 'if': {
+                                default: {
                                     const ifTerms = [];
                                     array[identifier] = parseCondition(ifTerms);
                                     node[AST.LOCATION_SYMBOL].requiredTerms = ifTerms;
@@ -829,7 +829,7 @@ export const parse = (tokens) => {
                 if (match(TokenType.MacroName)) {
                     const { value: macroName } = consume(TokenType.MacroName, ['include']);
                     switch (macroName) {
-                        case 'include': {
+                        default: {
                             const { value: functionSetName, location } = consume(TokenType.Identifier);
                             const functionSetSymbol = Symbol();
                             locationMap.set(functionSetSymbol, location);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@aeriajs/compiler",
   "type": "module",
-  "version": "0.0.77",
+  "version": "0.0.78",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -21,8 +21,8 @@
     "dist"
   ],
   "peerDependencies": {
-    "@aeriajs/common": "^0.0.163",
-    "@aeriajs/types": "^0.0.138"
+    "@aeriajs/common": "^0.0.164",
+    "@aeriajs/types": "^0.0.139"
   },
   "devDependencies": {
     "@aeriajs/common": "link:../common",