@aeriajs/compiler 0.0.59 → 0.0.61

package/dist/codegen/generateContracts.js

@@ -43,7 +43,7 @@ const makeJSContractsCode = (ast) => {
                 responseString = (0, utils_js_1.stringify)(responseArray);
             }
             else {
-                responseString = (0, utils_js_1.stringify)(getCodeForResponse(response));
+                responseString = getCodeForResponse(response);
             }
         }
         const contractSchema = (0, utils_js_1.recursivelyUnwrapPropertyNodes)(contractProperty);
@@ -57,7 +57,7 @@ const makeJSContractsCode = (ast) => {
         }
         return `export const ${name} = defineContract(${(0, utils_js_1.stringify)(contractSchema)})`;
     }).join('\n\n');
-    return `import { ${Array.from(imports).join(', ')} } from \'aeria\'\n\n` + declarations;
+    return `import { ${Array.from(imports).join(', ')} } from 'aeria'\n\n` + declarations;
 };
 const getResponseSchema = (response) => {
     const responseSchema = (0, utils_js_1.unwrapPropertyNode)(response);

package/dist/codegen/generateContracts.mjs

@@ -37,7 +37,7 @@ const makeJSContractsCode = (ast) => {
         }
         responseString = stringify(responseArray);
       } else {
-        responseString = stringify(getCodeForResponse(response));
+        responseString = getCodeForResponse(response);
       }
     }
     const contractSchema = recursivelyUnwrapPropertyNodes(contractProperty);

package/dist/codegen/generateExports.d.ts

@@ -1,8 +1,6 @@
 import type * as AST from '../ast.js';
-export declare const generateExports: (ast: AST.ProgramNode, options?: {
-    hasContracts: boolean;
-}) => {
-    main: {
+type Exports = {
+    index: {
         js: string;
         dts: string;
     };
@@ -15,3 +13,7 @@ export declare const generateExports: (ast: AST.ProgramNode, options?: {
         dts: string;
     };
 };
+export declare const generateExports: (ast: AST.ProgramNode, options?: {
+    hasContracts: boolean;
+}) => Exports;
+export {};

package/dist/codegen/generateExports.js

@@ -14,28 +14,28 @@ const generateExports = (ast, options = {
         };
         return symbols;
     }, {}));
+    let indexJs = "export * as collections from './collections/index.js'\n" +
+        `export { ${symbolsToExport.map((symbol) => symbol.extend).join(', ')} } from './collections/collections.js'\n`;
+    let indexDts = "export * as collections from './collections/index.js'\n" +
+        `export { ${symbolsToExport.map((symbol) => `${symbol.extend}, ${symbol.schema}`).join(', ')} } from './collections/collections.js'\n`;
+    if (options.hasContracts) {
+        indexJs += "export * as contracts from './contracts/index.js'\n";
+        indexDts += "export * as contracts from './contracts/index.js'\n";
+    }
     const exports = {
         collections: {
             js: `export { ${symbolsToExport.map((symbol) => `${symbol.id}`).join(', ')} } from './collections.js'`,
             dts: `export { ${symbolsToExport.map((symbol) => `${symbol.id}`).join(', ')} } from './collections.js'`,
         },
-        main: {
-            js: (options.hasContracts
-                ? 'export * as contracts from \'./contracts/index.js\'\n'
-                : '') +
-                'export * as collections from \'./collections/index.js\'\n' +
-                `export { ${symbolsToExport.map((symbol) => symbol.extend).join(', ')} } from './collections/collections.js'`,
-            dts: (options.hasContracts
-                ? 'export * as contracts from \'./contracts/index.js\'\n'
-                : '') +
-                'export * as collections from \'./collections/index.js\'\n' +
-                `export { ${symbolsToExport.map((symbol) => `${symbol.extend}, ${symbol.schema}`).join(', ')} } from './collections/collections.js'`,
+        index: {
+            js: indexJs,
+            dts: indexDts,
         },
     };
     if (options.hasContracts) {
         exports.contracts = {
-            js: 'export * from \'./contracts.js\'',
-            dts: 'export * from \'./contracts.js\'',
+            js: "export * from './contracts.js'",
+            dts: "export * from './contracts.js'",
         };
     }
     return exports;

package/dist/codegen/generateExports.mjs

@@ -12,16 +12,24 @@ export const generateExports = (ast, options = {
     };
     return symbols;
   }, {}));
+  let indexJs = `export * as collections from './collections/index.mjs'
+export { ${symbolsToExport.map((symbol) => symbol.extend).join(", ")} } from './collections/collections.mjs'
+`;
+  let indexDts = `export * as collections from './collections/index.mjs'
+export { ${symbolsToExport.map((symbol) => `${symbol.extend}, ${symbol.schema}`).join(", ")} } from './collections/collections.mjs'
+`;
+  if (options.hasContracts) {
+    indexJs += "export * as contracts from './contracts/index.mjs'\n";
+    indexDts += "export * as contracts from './contracts/index.mjs'\n";
+  }
   const exports = {
     collections: {
       js: `export { ${symbolsToExport.map((symbol) => `${symbol.id}`).join(", ")} } from './collections.mjs'`,
       dts: `export { ${symbolsToExport.map((symbol) => `${symbol.id}`).join(", ")} } from './collections.mjs'`
     },
-    main: {
-      js: (options.hasContracts ? "export * as contracts from './contracts/index.mjs'\n" : "") + `export * as collections from './collections/index.mjs'
-export { ${symbolsToExport.map((symbol) => symbol.extend).join(", ")} } from './collections/collections.mjs'`,
-      dts: (options.hasContracts ? "export * as contracts from './contracts/index.mjs'\n" : "") + `export * as collections from './collections/index.mjs'
-export { ${symbolsToExport.map((symbol) => `${symbol.extend}, ${symbol.schema}`).join(", ")} } from './collections/collections.mjs'`
+    index: {
+      js: indexJs,
+      dts: indexDts
     }
   };
   if (options.hasContracts) {

package/dist/codegen/generateTSCollections.js

@@ -67,7 +67,7 @@ const makeTSCollectionSchema = (collectionNode, collectionId) => {
                 break;
             case 'middlewares':
                 collectionSchema.middlewares = {
-                    [utils_js_1.UnquotedSymbol]: 'import(\'@aeriajs/types\').CollectionMiddleware<unknown>[]',
+                    [utils_js_1.UnquotedSymbol]: "import('@aeriajs/types').CollectionMiddleware<unknown>[]",
                 };
                 break;
             case 'functions':

package/dist/codegen/utils.js

@@ -134,20 +134,30 @@ const stringify = (value, parents = []) => {
         });
         return arrayString + `${'\t'.repeat(parents.length)}]`;
     }
-    if (!isRecord(value)) {
-        return typeof value === 'number' || typeof value === 'boolean' || !value
-            ? String(value)
-            : `"${String(value)}"`;
+    if (isRecord(value)) {
+        const objectString = Object.keys(value).map((key) => {
+            const currentParents = [
+                ...parents,
+                key,
+            ];
+            const indentation = '\t'.repeat(currentParents.length);
+            return `${indentation}${key}: ${checkQuotes(currentParents, value[key])}`;
+        }).join(',\n');
+        return `{\n${objectString}\n${'\t'.repeat(parents.length)}}`;
+    }
+    switch (typeof value) {
+        case 'undefined':
+        case 'number':
+        case 'boolean': {
+            return String(value);
+        }
+        default: {
+            if (value === null) {
+                return String(value);
+            }
+            return `"${String(value)}"`;
+        }
     }
-    const objectString = Object.keys(value).map((key) => {
-        const currentParents = [
-            ...parents,
-            key,
-        ];
-        const prefix = '\t'.repeat(currentParents.length);
-        return `${prefix}${key}: ${checkQuotes(currentParents, value[key])}`;
-    }).join(',\n');
-    return `{\n${objectString}\n${'\t'.repeat(parents.length)}}`;
 };
 exports.stringify = stringify;
 const checkQuotes = (parents, value) => {

package/dist/codegen/utils.mjs

@@ -118,20 +118,32 @@ export const stringify = (value, parents = []) => {
     });
     return arrayString + `${"	".repeat(parents.length)}]`;
   }
-  if (!isRecord(value)) {
-    return typeof value === "number" || typeof value === "boolean" || !value ? String(value) : `"${String(value)}"`;
-  }
-  const objectString = Object.keys(value).map((key) => {
-    const currentParents = [
-      ...parents,
-      key
-    ];
-    const prefix = "	".repeat(currentParents.length);
-    return `${prefix}${key}: ${checkQuotes(currentParents, value[key])}`;
-  }).join(",\n");
-  return `{
+  if (isRecord(value)) {
+    const objectString = Object.keys(value).map((key) => {
+      const currentParents = [
+        ...parents,
+        key
+      ];
+      const indentation = "	".repeat(currentParents.length);
+      return `${indentation}${key}: ${checkQuotes(currentParents, value[key])}`;
+    }).join(",\n");
+    return `{
 ${objectString}
 ${"	".repeat(parents.length)}}`;
+  }
+  switch (typeof value) {
+    case "undefined":
+    case "number":
+    case "boolean": {
+      return String(value);
+    }
+    default: {
+      if (value === null) {
+        return String(value);
+      }
+      return `"${String(value)}"`;
+    }
+  }
 };
 const checkQuotes = (parents, value) => {
   if (value && typeof value === "object" && UnquotedSymbol in value) {

package/dist/codegen.js

@@ -68,8 +68,8 @@ const generateCode = async (ast, options) => {
             ['index.d.ts']: exports.collections.dts,
             ['index.js']: exports.collections.js,
         },
-        ['index.d.ts']: exports.main.dts,
-        ['index.js']: exports.main.js,
+        ['index.d.ts']: exports.index.dts,
+        ['index.js']: exports.index.js,
     };
     if (contracts) {
         fileTree.contracts = {

package/dist/codegen.mjs

@@ -33,8 +33,8 @@ export const generateCode = async (ast, options) => {
       ["index.d.ts"]: exports.collections.dts,
       ["index.mjs"]: exports.collections.js
     },
-    ["index.d.ts"]: exports.main.dts,
-    ["index.mjs"]: exports.main.js
+    ["index.d.ts"]: exports.index.dts,
+    ["index.mjs"]: exports.index.js
   };
   if (contracts) {
     fileTree.contracts = {

package/dist/parser.js

@@ -144,9 +144,16 @@ const parse = (tokens) => {
         }
     };
     const parseArray = (types) => {
-        const { location: openingLocation } = consume(token_js_1.TokenType.LeftSquareBracket);
         const array = [];
         const symbols = [];
+        const { location: openingLocation } = consume(token_js_1.TokenType.LeftSquareBracket);
+        if (match(token_js_1.TokenType.RightSquareBracket)) {
+            consume(token_js_1.TokenType.RightSquareBracket);
+            return {
+                value: [],
+                symbols: [],
+            };
+        }
         let type;
         for (const typeCandidate of types) {
             if (match(typeCandidate)) {
@@ -681,7 +688,9 @@ const parse = (tokens) => {
         };
         if (match(token_js_1.TokenType.Keyword, 'extends')) {
             consume(token_js_1.TokenType.Keyword);
-            const { value: packageName } = consume(token_js_1.TokenType.Identifier);
+            const { value: packageName } = match(token_js_1.TokenType.QuotedString)
+                ? consume(token_js_1.TokenType.QuotedString)
+                : consume(token_js_1.TokenType.Identifier);
             consume(token_js_1.TokenType.Dot);
             const { value: symbolName } = consume(token_js_1.TokenType.Identifier);
             node.extends = {
@@ -856,7 +865,9 @@ const parse = (tokens) => {
                 }
                 let functionNode;
                 if (current().type === token_js_1.TokenType.Identifier && next().type === token_js_1.TokenType.Dot) {
-                    const { value: packageName } = consume(token_js_1.TokenType.Identifier);
+                    const { value: packageName } = match(token_js_1.TokenType.QuotedString)
+                        ? consume(token_js_1.TokenType.QuotedString)
+                        : consume(token_js_1.TokenType.Identifier);
                     consume(token_js_1.TokenType.Dot);
                     const { value: symbolName } = consume(token_js_1.TokenType.Identifier);
                     functionNode = {

package/dist/parser.mjs

@@ -106,9 +106,16 @@ export const parse = (tokens) => {
     }
   };
   const parseArray = (types) => {
-    const { location: openingLocation } = consume(TokenType.LeftSquareBracket);
     const array = [];
     const symbols = [];
+    const { location: openingLocation } = consume(TokenType.LeftSquareBracket);
+    if (match(TokenType.RightSquareBracket)) {
+      consume(TokenType.RightSquareBracket);
+      return {
+        value: [],
+        symbols: []
+      };
+    }
     let type;
     for (const typeCandidate of types) {
       if (match(typeCandidate)) {
@@ -628,7 +635,7 @@ export const parse = (tokens) => {
     };
     if (match(TokenType.Keyword, "extends")) {
       consume(TokenType.Keyword);
-      const { value: packageName } = consume(TokenType.Identifier);
+      const { value: packageName } = match(TokenType.QuotedString) ? consume(TokenType.QuotedString) : consume(TokenType.Identifier);
       consume(TokenType.Dot);
       const { value: symbolName } = consume(TokenType.Identifier);
       node.extends = {
@@ -801,7 +808,7 @@ export const parse = (tokens) => {
         }
         let functionNode;
         if (current().type === TokenType.Identifier && next().type === TokenType.Dot) {
-          const { value: packageName } = consume(TokenType.Identifier);
+          const { value: packageName } = match(TokenType.QuotedString) ? consume(TokenType.QuotedString) : consume(TokenType.Identifier);
           consume(TokenType.Dot);
           const { value: symbolName } = consume(TokenType.Identifier);
           functionNode = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aeriajs/compiler",
-  "version": "0.0.59",
+  "version": "0.0.61",
   "description": "",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -21,8 +21,8 @@
     "dist"
   ],
   "peerDependencies": {
-    "@aeriajs/common": "^0.0.156",
-    "@aeriajs/types": "^0.0.134"
+    "@aeriajs/common": "^0.0.157",
+    "@aeriajs/types": "^0.0.135"
   },
   "devDependencies": {
     "@aeriajs/common": "link:../common",