eddev 0.2.65 → 0.2.67-beta1

package/build/graphql-codegen/graphql-codegen-files.js

@@ -3,22 +3,22 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-var glob_promise_1 = require("glob-promise");
-var path_1 = __importDefault(require("path"));
+const glob_promise_1 = require("glob-promise");
+const path_1 = __importDefault(require("path"));
 module.exports = {
-    plugin: function (schema, documents, config, info) {
-        var folder = path_1.default.resolve(config.rootDir, config.folderName);
-        var imports = [];
-        var items = [];
-        var files = glob_promise_1.glob.sync(folder + "/**/*.tsx");
-        var filesFound = {};
-        var additionalTypes = config.additionalTypes || {};
+    plugin: (schema, documents, config, info) => {
+        const folder = path_1.default.resolve(config.rootDir, config.folderName);
+        const imports = [];
+        const items = [];
+        const files = glob_promise_1.glob.sync(folder + "/**/*.tsx");
+        const filesFound = {};
+        const additionalTypes = config.additionalTypes || {};
         // const additionalTypes: Record<string, string> = {
         //   "_html.tsx": `{ "template": string, "htmlContent": string }`,
         // }
-        var getRelative = function (path) { return path_1.default.relative(folder, path); };
-        var typeForFile = function (file, baseType) {
-            var types = [];
+        const getRelative = (path) => path_1.default.relative(folder, path);
+        const typeForFile = (file, baseType) => {
+            const types = [];
             if (baseType)
                 types.push(baseType);
             if (additionalTypes[file]) {
@@ -31,34 +31,40 @@ module.exports = {
                 return types.join(" & ");
             }
         };
-        documents.forEach(function (doc) {
-            var _a;
+        documents.forEach((doc) => {
             if (!doc.location.startsWith(folder))
                 return;
             filesFound[doc.location.replace(/\.graphql/, "")] = true;
-            var relative = getRelative(doc.location);
+            const relative = getRelative(doc.location);
             // const docsNames = doc.document.definitions.map(
             //   (def: any) => def.name.value
             // )
             if (relative && doc.document.definitions.length) {
-                var importedName = doc.document.definitions[0].name.value + "Query";
-                var typeName = ((_a = config.getType) === null || _a === void 0 ? void 0 : _a.call(config, importedName, doc.document.definitions[0])) || importedName;
+                let importedName = doc.document.definitions[0].name.value + "Query";
+                let typeName = config.getType?.(importedName, doc.document.definitions[0]) || importedName;
                 imports.push(importedName);
-                var key = relative.replace(/\.graphql/, "");
-                items.push("".concat(JSON.stringify(key), ": ").concat(typeForFile(key, typeName)));
+                const key = relative.replace(/\.graphql/, "");
+                items.push(`${JSON.stringify(key)}: ${typeForFile(key, typeName)}`);
             }
         });
-        for (var _i = 0, files_1 = files; _i < files_1.length; _i++) {
-            var file = files_1[_i];
+        for (const file of files) {
             if (!filesFound[file.replace(/\.tsx/, "")]) {
-                var key = getRelative(file).replace(/\.tsx$/, "");
-                items.push("".concat(JSON.stringify(key), ": ").concat(typeForFile(key, "")));
+                const key = getRelative(file).replace(/\.tsx$/, "");
+                items.push(`${JSON.stringify(key)}: ${typeForFile(key, "")}`);
             }
         }
         if (imports.length === 0) {
             process.exit();
-            return "export { };";
+            return `export { };`;
         }
-        return "import { ".concat(imports.sort().join(", "), " } from \"./types.graphql\"\nexport { };\n\ndeclare global {\n  type ").concat(config.globalName, " = {\n").concat(items.sort().join(",\n"), "\n  }\n}\n      ");
+        return `import { ${imports.sort().join(", ")} } from "./types.graphql"
+export { };
+
+declare global {
+  type ${config.globalName} = {
+${items.sort().join(",\n")}
+  }
+}
+      `;
     },
 };

package/build/graphql-codegen/graphql-codegen-no-duplicates.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 module.exports = {
-    plugin: function () { },
-    validate: function (schema, documents, config, info) {
-        documents.forEach(function (doc) {
+    plugin: () => { },
+    validate: (schema, documents, config, info) => {
+        documents.forEach((doc) => {
             if (doc.document.definitions.length === 0) {
-                throw new Error("GraphQL file '".concat(doc.location, "' does not contain any uniquely named operations."));
+                throw new Error(`GraphQL file '${doc.location}' does not contain any uniquely named operations.`);
                 process.exit();
             }
         });

package/build/graphql-codegen/graphql-codegen-queries.js

@@ -1,33 +1,23 @@
 "use strict";
-var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
-    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
-        if (ar || !(i in from)) {
-            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
-            ar[i] = from[i];
-        }
-    }
-    return to.concat(ar || Array.prototype.slice.call(from));
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-var graphql_1 = require("graphql");
-var path_1 = require("path");
+const graphql_1 = require("graphql");
+const path_1 = require("path");
 module.exports = {
-    plugin: function (schema, documents, config, info) {
-        var hooks = {};
-        var importTypes = [];
-        var importUtils = {};
-        documents.forEach(function (doc) {
-            var fullFileName = doc.location;
-            var fileName = doc.location.replace(config.rootDir, "");
+    plugin: (schema, documents, config, info) => {
+        const hooks = {};
+        const importTypes = [];
+        const importUtils = {};
+        documents.forEach((doc) => {
+            const fullFileName = doc.location;
+            const fileName = doc.location.replace(config.rootDir, "");
             if (doc.document.definitions.length) {
-                var foundQueryOperation_1 = false;
-                doc.document.definitions.forEach(function (item) {
-                    var _a, _b, _c;
+                let foundQueryOperation = false;
+                doc.document.definitions.forEach((item) => {
                     // We only care about 'operations'
                     if (item.kind !== "OperationDefinition" || !item.name)
                         return;
                     function throwErrorAtLocation(loc, message) {
-                        var printedSource = "";
+                        let printedSource = "";
                         if (loc && loc.source) {
                             loc.source.name = fileName;
                             printedSource = (0, graphql_1.printSourceLocation)(loc.source, {
@@ -35,45 +25,45 @@ module.exports = {
                                 column: loc.startToken.column,
                             });
                         }
-                        var fullMessage = message;
+                        let fullMessage = message;
                         if (printedSource) {
                             fullMessage += ":\n\n" + printedSource;
                         }
                         else {
-                            fullMessage += " (in ".concat(fileName, ")");
+                            fullMessage += ` (in ${fileName})`;
                         }
-                        var err = new Error(fullMessage);
+                        const err = new Error(fullMessage);
                         err.name = "QueryError";
                         throw err;
                     }
                     // Ensure only ONE operation per query file
-                    if (foundQueryOperation_1) {
+                    if (foundQueryOperation) {
                         throwErrorAtLocation(item.loc, "Only one operation is allowed in each queries/*.graphql file");
                     }
-                    foundQueryOperation_1 = true;
+                    foundQueryOperation = true;
                     /**
                      * Determine the 'hook type'
                      * - 'mutation' if the operation starts with 'mutation' instead of 'query'
                      * - 'infinite' if the operation contains the word 'infinite'
                      * - 'normal' otherwise
                      */
-                    var type = item.operation === "mutation" ? "mutation" : item.name.value.match(/infinite/i) ? "infinite" : "normal";
-                    var name = item.name.value;
-                    var hookName = "use" + name.replace(/^use/i, "").replace(/^[a-z]/, function (c) { return c.toUpperCase(); });
-                    var variablesTypeName = ((_a = item.variableDefinitions) === null || _a === void 0 ? void 0 : _a.length)
+                    const type = item.operation === "mutation" ? "mutation" : item.name.value.match(/infinite/i) ? "infinite" : "normal";
+                    const name = item.name.value;
+                    const hookName = "use" + name.replace(/^use/i, "").replace(/^[a-z]/, (c) => c.toUpperCase());
+                    const variablesTypeName = item.variableDefinitions?.length
                         ? type === "mutation"
                             ? name + "MutationVariables"
                             : name + "QueryVariables"
                         : null;
-                    var resultTypeName = name + (type === "mutation" ? "Mutation" : "Query");
+                    const resultTypeName = name + (type === "mutation" ? "Mutation" : "Query");
                     // For conventions sake, the name of the operation should start with 'Use'
                     if (!name.match(/^Use/)) {
-                        throwErrorAtLocation(item.name.loc, "Expected your query name to start with 'Use', but found '".concat(name, "'. Did you mean 'Use").concat(name, "'"));
+                        throwErrorAtLocation(item.name.loc, `Expected your query name to start with 'Use', but found '${name}'. Did you mean 'Use${name}'`);
                     }
                     // Another convention, the query name and file name should be the same
-                    var baseName = (0, path_1.basename)(fileName);
+                    const baseName = (0, path_1.basename)(fileName);
                     if (baseName.replace(".graphql", "") !== name) {
-                        throwErrorAtLocation(item.name.loc, "Expected your query name and file name to match, for conventions sake (eg. '".concat(baseName, "' should be '").concat(name, ".graphql')"));
+                        throwErrorAtLocation(item.name.loc, `Expected your query name and file name to match, for conventions sake (eg. '${baseName}' should be '${name}.graphql')`);
                     }
                     // Only import variables if the operation has variables
                     if (variablesTypeName) {
@@ -83,165 +73,178 @@ module.exports = {
                     if (type === "normal") {
                         // Just a normal query!
                         importUtils["createUseQuery"] = true;
-                        hooks[hookName] = "\n              createUseQuery<".concat(resultTypeName, ", ").concat(variablesTypeName || "undefined", ">({\n                name: ").concat(JSON.stringify(name), "\n              })\n            ");
+                        hooks[hookName] = `
+              createUseQuery<${resultTypeName}, ${variablesTypeName || "undefined"}>({
+                name: ${JSON.stringify(name)}
+              })
+            `;
                     }
                     else if (type === "mutation") {
                         // A triggerable mutation
                         importUtils["createUseMutation"] = true;
-                        hooks[hookName] = "\n              createUseMutation<".concat(resultTypeName, ", ").concat(variablesTypeName || "undefined", ">({\n                name: ").concat(JSON.stringify(name), "\n              })\n            ");
+                        hooks[hookName] = `
+              createUseMutation<${resultTypeName}, ${variablesTypeName || "undefined"}>({
+                name: ${JSON.stringify(name)}
+              })
+            `;
                     }
                     else if (type === "infinite") {
                         // Ensure the query has 'limit' and 'cursor' variables
-                        var limitVariableIsValid_1 = false;
-                        var cursorVariableIsValid_1 = false;
-                        var defaultLimit_1 = 0;
-                        (_b = item.variableDefinitions) === null || _b === void 0 ? void 0 : _b.forEach(function (item) {
-                            var _a, _b;
-                            var variable = item.variable, type = item.type, loc = item.loc, defaultValue = item.defaultValue;
-                            if (((_a = variable === null || variable === void 0 ? void 0 : variable.name) === null || _a === void 0 ? void 0 : _a.value) === "limit") {
+                        let limitVariableIsValid = false;
+                        let cursorVariableIsValid = false;
+                        let defaultLimit = 0;
+                        item.variableDefinitions?.forEach((item) => {
+                            const { variable, type, loc, defaultValue } = item;
+                            if (variable?.name?.value === "limit") {
                                 // Found 'limit', but make sure it's an Int, and has a default value
                                 if (type.kind === "NamedType" && type.name.value === "Int") {
                                     if (defaultValue && defaultValue.kind === "IntValue") {
-                                        limitVariableIsValid_1 = true;
-                                        defaultLimit_1 = Number(defaultValue.value);
+                                        limitVariableIsValid = true;
+                                        defaultLimit = Number(defaultValue.value);
                                     }
                                     else {
-                                        throwErrorAtLocation(loc, "For infinite queries, be sure to give the '$limit' variable a default value!\nFor example: posts($limit: Int = 10, $cursor: String)\nRead more -> https://eddev.ed.studio/docs/graphql/query-hooks");
+                                        throwErrorAtLocation(loc, `For infinite queries, be sure to give the '$limit' variable a default value!\nFor example: posts($limit: Int = 10, $cursor: String)\nRead more -> https://eddev.ed.studio/docs/graphql/query-hooks`);
                                     }
                                 }
                                 else {
                                     // @ts-ignore
-                                    var wrongType = (_b = type === null || type === void 0 ? void 0 : type.name) === null || _b === void 0 ? void 0 : _b.value;
-                                    throwErrorAtLocation(loc, "For infinite queries, the '$limit' variable is expected to be an 'Int' type, but you've used '".concat(wrongType, "' instead!\nFor example: posts($limit: Int = 10, $cursor: String)\nRead more -> https://eddev.ed.studio/docs/graphql/query-hooks"));
+                                    const wrongType = type?.name?.value;
+                                    throwErrorAtLocation(loc, `For infinite queries, the '$limit' variable is expected to be an 'Int' type, but you've used '${wrongType}' instead!\nFor example: posts($limit: Int = 10, $cursor: String)\nRead more -> https://eddev.ed.studio/docs/graphql/query-hooks`);
                                 }
                             }
                             else if (variable.name.value === "cursor") {
                                 // Found 'cursor', but make sure it's a string
                                 if (type.kind === "NamedType") {
                                     if (type.name.value === "String") {
-                                        cursorVariableIsValid_1 = true;
+                                        cursorVariableIsValid = true;
                                     }
                                     else {
-                                        throwErrorAtLocation(loc, "For infinite queries, the required '$cursor' variable must be an optional String.\nFor example: posts($limit: Int = 10, $cursor: String)\nRead more -> https://eddev.ed.studio/docs/graphql/query-hooks");
+                                        throwErrorAtLocation(loc, `For infinite queries, the required '$cursor' variable must be an optional String.\nFor example: posts($limit: Int = 10, $cursor: String)\nRead more -> https://eddev.ed.studio/docs/graphql/query-hooks`);
                                     }
                                 }
                             }
                         });
                         // Check that both the 'limit' and 'cursor' variables are present!
-                        if (!cursorVariableIsValid_1 || !limitVariableIsValid_1) {
-                            throwErrorAtLocation(item.loc, "For infinite queries, you must supply and use the '$limit' and '$cursor' variables\nFor example: posts($limit: Int = 10, $cursor: String) ".concat(cursorVariableIsValid_1, " ").concat(limitVariableIsValid_1, "\nRead more -> https://eddev.ed.studio/docs/graphql/query-hooks"));
+                        if (!cursorVariableIsValid || !limitVariableIsValid) {
+                            throwErrorAtLocation(item.loc, `For infinite queries, you must supply and use the '$limit' and '$cursor' variables\nFor example: posts($limit: Int = 10, $cursor: String) ${cursorVariableIsValid} ${limitVariableIsValid}\nRead more -> https://eddev.ed.studio/docs/graphql/query-hooks`);
                         }
                         // Finally, ensure that pageInfo is queried somewhere
                         // We actually want the selection path for a whole bunch of fields, so that we can extract pagination info, and the list of data
-                        var pageInfo_1 = {
+                        const pageInfo = {
                             nodesPath: null,
                             pageInfoPath: null,
                             endCursorPath: null,
                             hasNextPagePath: null,
                         };
-                        var nodesPaths_1 = [];
+                        let nodesPaths = [];
                         // To do this, we use the visitor pattern to find the pageInfo field selection
-                        var lookingAtPageInfo_1 = true;
-                        var lookupPath_1 = [];
-                        var parentNode_1;
+                        let lookingAtPageInfo = true;
+                        let lookupPath = [];
+                        let parentNode;
                         (0, graphql_1.visit)(item.selectionSet, {
-                            enter: function (node, key, parent, path, ancestors) {
+                            enter(node, key, parent, path, ancestors) {
                                 if (node.kind === "Field") {
-                                    lookupPath_1 = __spreadArray(__spreadArray([], lookupPath_1, true), [node.name.value], false);
+                                    lookupPath = [...lookupPath, node.name.value];
                                     if (node.name.value === "pageInfo") {
-                                        parentNode_1 = ancestors[ancestors.length - 2];
+                                        parentNode = ancestors[ancestors.length - 2];
                                         // parentNode = ancestors
-                                        if (pageInfo_1.pageInfoPath) {
+                                        if (pageInfo.pageInfoPath) {
                                             // Detected multiple pageInfo fields in the query — confusing!
-                                            throwErrorAtLocation(node.loc, "For infinite queries, be sure to only use 'pageInfo' once. Multiple 'pageInfo' fields were selected in your query!");
+                                            throwErrorAtLocation(node.loc, `For infinite queries, be sure to only use 'pageInfo' once. Multiple 'pageInfo' fields were selected in your query!`);
                                         }
-                                        lookingAtPageInfo_1 = true;
-                                        pageInfo_1.pageInfoPath = lookupPath_1;
+                                        lookingAtPageInfo = true;
+                                        pageInfo.pageInfoPath = lookupPath;
                                     }
                                     else if (node.name.value === "nodes") {
-                                        nodesPaths_1.push(lookupPath_1);
+                                        nodesPaths.push(lookupPath);
                                     }
-                                    else if (lookingAtPageInfo_1) {
+                                    else if (lookingAtPageInfo) {
                                         if (node.name.value === "endCursor") {
-                                            pageInfo_1.endCursorPath = lookupPath_1;
+                                            pageInfo.endCursorPath = lookupPath;
                                         }
                                         else if (node.name.value === "hasNextPage") {
-                                            pageInfo_1.hasNextPagePath = lookupPath_1;
+                                            pageInfo.hasNextPagePath = lookupPath;
                                         }
                                     }
                                 }
                             },
-                            leave: function (node, key, parent, path, ancestors) {
+                            leave(node, key, parent, path, ancestors) {
                                 if (node.kind === "Field") {
-                                    lookupPath_1 = lookupPath_1.slice(0, -1);
+                                    lookupPath = lookupPath.slice(0, -1);
                                     if (node.name.value === "pageInfo") {
-                                        lookingAtPageInfo_1 = false;
+                                        lookingAtPageInfo = false;
                                     }
                                 }
                             },
                         });
                         // Make sure we found pageInfo { endCursor, hasNextPage }
-                        if (!pageInfo_1.pageInfoPath || !pageInfo_1.endCursorPath || !pageInfo_1.hasNextPagePath) {
-                            throwErrorAtLocation(undefined, "For infinite queries, you need to ensure you select the 'pageInfo' field and it's child 'hasNextPage' and 'endCursor' fields\nRead more -> https://eddev.ed.studio/docs/graphql/query-hooks");
+                        if (!pageInfo.pageInfoPath || !pageInfo.endCursorPath || !pageInfo.hasNextPagePath) {
+                            throwErrorAtLocation(undefined, `For infinite queries, you need to ensure you select the 'pageInfo' field and it's child 'hasNextPage' and 'endCursor' fields\nRead more -> https://eddev.ed.studio/docs/graphql/query-hooks`);
                         }
                         // Look for a nodes path which shares the same parent as the pageInfo path
-                        var expectedNodesPath_1 = pageInfo_1.pageInfoPath.slice(0, -1).join(",");
-                        pageInfo_1.nodesPath = nodesPaths_1.find(function (path) {
-                            var testPath = path.slice(0, -1).join(",");
-                            return testPath === expectedNodesPath_1;
+                        const expectedNodesPath = pageInfo.pageInfoPath.slice(0, -1).join(",");
+                        pageInfo.nodesPath = nodesPaths.find((path) => {
+                            const testPath = path.slice(0, -1).join(",");
+                            return testPath === expectedNodesPath;
                         });
-                        if (!pageInfo_1.nodesPath || !parentNode_1) {
-                            throwErrorAtLocation(undefined, "For infinite queries, be sure to select some nodes using the 'nodes' field, adjacent to the 'pageInfo' field which has been selected.\nRead more -> https://eddev.ed.studio/docs/graphql/query-hooks");
+                        if (!pageInfo.nodesPath || !parentNode) {
+                            throwErrorAtLocation(undefined, `For infinite queries, be sure to select some nodes using the 'nodes' field, adjacent to the 'pageInfo' field which has been selected.\nRead more -> https://eddev.ed.studio/docs/graphql/query-hooks`);
                         }
-                        var firstArgumentIsValid_1 = false;
-                        var afterArgumentIsValid_1 = false;
-                        (_c = parentNode_1 === null || parentNode_1 === void 0 ? void 0 : parentNode_1.arguments) === null || _c === void 0 ? void 0 : _c.forEach(function (arg) {
+                        let firstArgumentIsValid = false;
+                        let afterArgumentIsValid = false;
+                        parentNode?.arguments?.forEach((arg) => {
                             if (arg.kind === "Argument") {
                                 if (arg.name.value === "first") {
                                     if (arg.value.kind === "Variable") {
                                         if (arg.value.name.value === "limit") {
-                                            firstArgumentIsValid_1 = true;
+                                            firstArgumentIsValid = true;
                                         }
                                     }
                                 }
                                 if (arg.name.value === "after") {
                                     if (arg.value.kind === "Variable") {
                                         if (arg.value.name.value === "cursor") {
-                                            afterArgumentIsValid_1 = true;
+                                            afterArgumentIsValid = true;
                                         }
                                     }
                                 }
                             }
                         });
-                        if (parentNode_1 && (!firstArgumentIsValid_1 || !afterArgumentIsValid_1)) {
-                            throwErrorAtLocation(parentNode_1.loc, "You must use the arguments (first: $limit, after: $cursor) when using infinite queries.\nRead more -> https://eddev.ed.studio/docs/graphql/query-hooks");
+                        if (parentNode && (!firstArgumentIsValid || !afterArgumentIsValid)) {
+                            throwErrorAtLocation(parentNode.loc, `You must use the arguments (first: $limit, after: $cursor) when using infinite queries.\nRead more -> https://eddev.ed.studio/docs/graphql/query-hooks`);
                         }
                         // Drill down to the path type
-                        var finalResultTypeName_1 = resultTypeName;
-                        pageInfo_1.nodesPath.forEach(function (key) {
-                            finalResultTypeName_1 = "Exclude<".concat(finalResultTypeName_1, "[").concat(JSON.stringify(key), "], undefined | null>");
+                        let finalResultTypeName = resultTypeName;
+                        pageInfo.nodesPath.forEach((key) => {
+                            finalResultTypeName = `Exclude<${finalResultTypeName}[${JSON.stringify(key)}], undefined | null>`;
                         });
                         importUtils["createUseInfiniteQuery"] = true;
-                        hooks[hookName] = "\n              createUseInfiniteQuery<Exclude<".concat(finalResultTypeName_1, "[0], undefined | null>, Omit<").concat(variablesTypeName || "undefined", ", 'limit' | 'cursor'>>({\n                name: ").concat(JSON.stringify(name), ",\n                defaultLimit: ").concat(defaultLimit_1, ",\n                paths: ").concat(JSON.stringify(pageInfo_1), "\n              })\n            ");
+                        hooks[hookName] = `
+              createUseInfiniteQuery<Exclude<${finalResultTypeName}[0], undefined | null>, Omit<${variablesTypeName || "undefined"}, 'limit' | 'cursor'>>({
+                name: ${JSON.stringify(name)},
+                defaultLimit: ${defaultLimit},
+                paths: ${JSON.stringify(pageInfo)}
+              })
+            `;
                     }
                 });
             }
         });
-        var utilsToImport = Object.keys(importUtils);
+        const utilsToImport = Object.keys(importUtils);
         if (!utilsToImport)
-            return "export {}";
-        var codeBlocks = [];
+            return `export {}`;
+        const codeBlocks = [];
         // Import required utility functions
         if (utilsToImport.length) {
-            codeBlocks.push("import { ".concat(utilsToImport.join(", "), " } from 'eddev/hooks/queryUtils'"));
+            codeBlocks.push(`import { ${utilsToImport.join(", ")} } from 'eddev/hooks/queryUtils'`);
         }
         // Import types from types.graphql
         if (importTypes.length) {
-            codeBlocks.push("import { ".concat(importTypes, " } from '../types.graphql'"));
+            codeBlocks.push(`import { ${importTypes} } from '../types.graphql'`);
         }
-        for (var hookName in hooks) {
-            var hookCode = hooks[hookName];
-            codeBlocks.push("export const ".concat(hookName, " = ").concat(hookCode));
+        for (const hookName in hooks) {
+            const hookCode = hooks[hookName];
+            codeBlocks.push(`export const ${hookName} = ${hookCode}`);
         }
         return codeBlocks.join("\n\n");
     },

package/build/manifests/manifest-blocks.d.ts

@@ -1,4 +1,4 @@
-declare type Options = {
+type Options = {
     baseDirectory: string;
     isAdmin: boolean;
     isDev: boolean;

package/build/manifests/manifest-blocks.js

@@ -4,57 +4,65 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createBlockManifestGenerator = void 0;
-var manifest_1 = require("./manifest");
-var path_1 = __importDefault(require("path"));
-var change_case_1 = require("change-case");
-var fs_1 = require("fs");
-var JSX = /\.(jsx|tsx|ts|js)$/i;
+const manifest_1 = require("./manifest");
+const path_1 = __importDefault(require("path"));
+const change_case_1 = require("change-case");
+const fs_1 = require("fs");
+const JSX = /\.(jsx|tsx|ts|js)$/i;
 function createBlockManifestGenerator(opts) {
     return (0, manifest_1.createManifestGenerator)({
         glob: path_1.default.join(opts.baseDirectory, "/blocks/**/*.tsx"),
         onGenerate: opts.onGenerate,
         watch: opts.watch,
-        generate: function (fileNames) {
-            var files = fileNames
-                .filter(function (file) { return !file.includes("/_core"); })
-                .map(function (file) {
-                var relative = path_1.default.relative(opts.baseDirectory, file).replace(JSX, "");
-                var name = path_1.default.basename(file).replace(JSX, "");
-                var module = JSON.stringify("./" + relative).replace(JSX, "");
-                var componentName = (0, change_case_1.pascalCase)(name);
+        generate(fileNames) {
+            const files = fileNames
+                .filter((file) => !file.includes("/_core"))
+                .map((file) => {
+                const relative = path_1.default.relative(opts.baseDirectory, file).replace(JSX, "");
+                const name = path_1.default.basename(file).replace(JSX, "");
+                const module = JSON.stringify("./" + relative).replace(JSX, "");
+                const componentName = (0, change_case_1.pascalCase)(name);
                 // Test if the block has Dynamic: true in the header
-                var dynamic = !opts.isAdmin &&
+                const dynamic = !opts.isAdmin &&
                     !!(0, fs_1.readFileSync)(file)
                         .toString()
                         .match(/\*[\s]*dynamic: true/i);
-                return { relative: relative, name: name, module: module, componentName: componentName, dynamic: dynamic };
+                return { relative, name, module, componentName, dynamic };
             });
-            return "\n        import coreBlocks from './blocks/_core'\n        import { dynamic } from 'eddev/dynamic';\n  \n        ".concat(files
-                .map(function (_a) {
-                var relative = _a.relative, componentName = _a.componentName, module = _a.module, dynamic = _a.dynamic;
-                var parts = relative.replace(/\.tsx$/, "").split("/");
-                var blockName = "acf/" + parts.slice(1).join("-");
+            return `
+        import coreBlocks from './blocks/_core'
+        import { dynamic } from 'eddev/dynamic';
+  
+        ${files
+                .map(({ relative, componentName, module, dynamic }) => {
+                const parts = relative.replace(/\.tsx$/, "").split("/");
+                const blockName = "acf/" + parts.slice(1).join("-");
                 if (dynamic) {
                     return null;
                 }
                 else {
-                    return "import ".concat(componentName, " from ").concat(module);
+                    return `import ${componentName} from ${module}`;
                 }
             })
                 .filter(Boolean)
-                .join("\n"), "\n  \n        export default {\n          ...coreBlocks,\n          ").concat(files
-                .map(function (_a) {
-                var relative = _a.relative, componentName = _a.componentName, module = _a.module, dynamic = _a.dynamic;
-                var parts = relative.replace(/\.tsx$/, "").split("/");
-                var blockName = "acf/" + parts.slice(1).join("-");
+                .join("\n")}
+  
+        export default {
+          ...coreBlocks,
+          ${files
+                .map(({ relative, componentName, module, dynamic }) => {
+                const parts = relative.replace(/\.tsx$/, "").split("/");
+                const blockName = "acf/" + parts.slice(1).join("-");
                 if (dynamic) {
-                    return "\"".concat(blockName, "\": dynamic(() => import(").concat(module, "))");
+                    return `"${blockName}": dynamic(() => import(${module}))`;
                 }
                 else {
-                    return "\"".concat(blockName, "\": ").concat(componentName);
+                    return `"${blockName}": ${componentName}`;
                 }
             })
-                .join(",\n"), "\n        }\n      ");
+                .join(",\n")}
+        }
+      `;
         },
     });
 }

package/build/manifests/manifest-fields.d.ts

@@ -1,4 +1,4 @@
-declare type Options = {
+type Options = {
     baseDirectory: string;
     isAdmin: boolean;
     isDev: boolean;