@futurebrand/dev-tools 2.7.0 → 2.7.2

package/dist/commands/ai/modules/figma/index.d.ts

@@ -4,7 +4,9 @@ declare class FigmaModule {
     private api;
     constructor(state: AIState);
     private addVariantsToBlock;
-    private getDefaultCheckedBlocks;
+    private getNewBlocks;
+    private getBlocksDataFromFigma;
+    private getDefaultBlocks;
     loadBlocks(): Promise<void>;
 }
 export default FigmaModule;

package/dist/commands/ai/modules/figma/index.js

@@ -19,35 +19,25 @@ class FigmaModule {
             data.variants.push(variant);
         }
     }
-    async getDefaultCheckedBlocks(blocks) {
+    async getNewBlocks(blocks) {
         const data = this.state.getData();
-        const defaultBlocks = [];
+        const newBlocks = [];
         const nextProject = data.projects.find((project) => project.type === 'next.js');
+        if (!nextProject) {
+            return [];
+        }
         for (const block of blocks) {
-            if (nextProject) {
-                const alreadyGenerated = await this.state.file.verifyBlockAlreadyGenerated(block.name, nextProject);
-                if (alreadyGenerated) {
-                    continue;
-                }
-                const alreadyExist = await this.state.file.verifyBlockAlreadyExists(nextProject, block.name);
-                if (alreadyExist) {
-                    continue;
-                }
-            }
-            if (!block.hidden) {
-                defaultBlocks.push(block.name);
+            const alreadyExist = await this.state.file.verifyBlockAlreadyExists(nextProject, block.name);
+            if (!alreadyExist) {
+                newBlocks.push(block.name);
             }
         }
-        return defaultBlocks;
+        return newBlocks;
     }
-    async loadBlocks() {
-        console.log('- Finding figma blocks canvas... Please wait');
-        const data = this.state.getData();
-        const figmaPageID = data.configs.figma;
+    async getBlocksDataFromFigma(figmaPageID) {
         const canvas = await this.api.getBlockCanvas(figmaPageID);
-        console.log('- Loading pages blocks');
-        const blocksData = [];
         const blocks = await this.api.getBlocks(figmaPageID, canvas);
+        const blocksData = [];
         Object.keys(blocks).forEach((blockName) => {
             let block = blocksData.find((block) => block.name === blockName);
             if (!block) {
@@ -55,31 +45,51 @@ class FigmaModule {
                     name: blockName,
                     variants: [],
                     hidden: false,
-                    generated: false,
                 };
                 blocksData.push(block);
             }
             this.addVariantsToBlock(block, blocks[blockName]);
         });
-        const blockNames = blocksData.map((block) => block.name);
-        console.log(`- Loaded ${blocksData.length} blocks from Figma (${blockNames.length} new)`);
-        const defaultCheckedBlocks = await this.getDefaultCheckedBlocks(blocksData);
-        if (blockNames.length) {
-            const query = await inquirer_1.default.prompt([
-                {
-                    type: 'checkbox',
-                    name: 'blocks',
-                    message: 'What blocks do you want to use?',
-                    choices: blockNames,
-                    default: defaultCheckedBlocks,
-                },
-            ]);
-            for (const blockName of blockNames) {
-                const block = blocksData.find((b) => b.name === blockName);
-                if (block) {
-                    const isNotHidden = query.blocks.includes(blockName);
-                    block.hidden = !isNotHidden;
-                }
+        return blocksData;
+    }
+    getDefaultBlocks(blockNames) {
+        try {
+            const blocks = this.state.getData().blocks;
+            return blockNames.filter((blockName) => {
+                const block = blocks.find((b) => b.name === blockName);
+                return block ? !block.hidden : true;
+            });
+        }
+        catch {
+            return blockNames;
+        }
+    }
+    async loadBlocks() {
+        console.log('- Finding figma blocks canvas... Please wait');
+        const data = this.state.getData();
+        console.log('- Loading pages blocks');
+        const blocksData = await this.getBlocksDataFromFigma(data.configs.figma);
+        const newBlocks = await this.getNewBlocks(blocksData);
+        if (newBlocks.length === 0) {
+            console.log('- No new blocks found in Figma');
+            return;
+        }
+        const defaultBlocks = this.getDefaultBlocks(newBlocks);
+        console.log(`- Loaded ${blocksData.length} blocks from Figma ${blocksData.length !== newBlocks.length ? `(${newBlocks.length} new)` : ''}`);
+        const query = await inquirer_1.default.prompt([
+            {
+                type: 'checkbox',
+                name: 'blocks',
+                message: 'What blocks do you want to use?',
+                choices: newBlocks,
+                default: defaultBlocks,
+            },
+        ]);
+        for (const blockName of newBlocks) {
+            const block = blocksData.find((b) => b.name === blockName);
+            if (block) {
+                const isNotHidden = query.blocks.includes(blockName);
+                block.hidden = !isNotHidden;
             }
         }
         this.state.setBlocks(blocksData);

package/dist/commands/ai/modules/state/index.d.ts

@@ -19,7 +19,6 @@ declare class AIState {
     getAvailableBlocksNames(filters?: IAvailableFilters): string[];
     setBlocks(blocks: IAIFileState['blocks']): void;
     setColors(colors: IAIFileState['colors']): void;
-    setBlockGenerated(blockName: string, generated?: boolean): void;
     getBlockVariants(blockName: string): any[];
     setBlockHidden(blockName: string, hidden?: boolean): void;
     static init(): Promise<AIState>;

package/dist/commands/ai/modules/state/index.js

@@ -20,13 +20,9 @@ class AIState {
             {
                 type: 'input',
                 name: 'apiUrl',
+                default: 'http://localhost:3333',
                 message: 'What is the AI API url?',
             },
-            {
-                type: 'input',
-                name: 'apiToken',
-                message: 'What is the AI API token?',
-            },
             {
                 type: 'input',
                 name: 'page',
@@ -37,7 +33,6 @@ class AIState {
         return {
             configs: {
                 api: query.apiUrl,
-                token: query.apiToken,
                 figma: query.page,
             },
             projects,
@@ -84,9 +79,6 @@ class AIState {
                 if (hidden != null && block.hidden !== hidden) {
                     return false;
                 }
-                if (generated != null && block.generated !== generated) {
-                    return false;
-                }
                 return true;
             });
         }
@@ -105,13 +97,6 @@ class AIState {
         }
         this.data.colors = colors;
     }
-    setBlockGenerated(blockName, generated = true) {
-        const blocks = this.getData().blocks;
-        const block = blocks.find((block) => block.name === blockName);
-        if (block) {
-            block.generated = generated;
-        }
-    }
     getBlockVariants(blockName) {
         const blocks = this.getData().blocks.find((block) => block.name === blockName);
         return blocks?.variants || [];

package/dist/commands/ai/modules/state/types.d.ts

@@ -7,7 +7,6 @@ export interface IStateConfigs extends IServerConfigs {
 export interface IBlockData {
     name: string;
     hidden: boolean;
-    generated: boolean;
     variants: IFigmaNode[];
 }
 export interface IProjectColor {

package/dist/modules/ai-server-module/index.d.ts

@@ -2,7 +2,6 @@ import type { IServerConfigs } from './types';
 declare class AIServerModule implements IServerConfigs {
     private filePath;
     api: string;
-    token: string;
     constructor();
     private createConfigs;
     create(): Promise<void>;

package/dist/modules/ai-server-module/index.js

@@ -16,7 +16,6 @@ const longTimeoutAgent = new undici_1.Agent({
 class AIServerModule {
     filePath = '';
     api = '';
-    token = '';
     constructor() {
         (0, node_net_1.setDefaultAutoSelectFamilyAttemptTimeout)(TIMEOUT_LIMIT_TIME);
     }
@@ -25,23 +24,17 @@ class AIServerModule {
             {
                 type: 'input',
                 name: 'apiUrl',
+                default: 'http://localhost:3333',
                 message: 'What is the AI API url?',
             },
-            {
-                type: 'input',
-                name: 'apiToken',
-                message: 'What is the AI API token?',
-            },
         ]);
         return {
             api: query.apiUrl,
-            token: query.apiToken,
         };
     }
     async create() {
         const configs = await this.createConfigs();
         this.api = configs.api;
-        this.token = configs.token;
     }
     async fetchApi(path, init) {
         if (!this.isReady) {
@@ -55,7 +48,6 @@ class AIServerModule {
             ...init,
             headers: {
                 'Content-Type': 'application/json',
-                Authorization: `Bearer ${this.token}`,
                 ...init?.headers,
             },
             signal: AbortSignal.timeout(TIMEOUT_LIMIT_TIME),
@@ -83,7 +75,6 @@ class AIServerModule {
     }
     setApiConfigs(configs) {
         this.api = configs.api;
-        this.token = configs.token;
     }
     async save() {
         if (!this.isReady) {
@@ -92,11 +83,10 @@ class AIServerModule {
         const filePath = this.filePath || (await (0, files_1.getTempFilePath)(FILE_NAME));
         await (0, files_1.writeJSONFile)(filePath, {
             api: this.api,
-            token: this.token,
         });
     }
     get isReady() {
-        return this.api !== '' && this.token !== '';
+        return this.api !== '';
     }
 }
 exports.default = AIServerModule;

package/dist/modules/ai-server-module/types.d.ts

@@ -1,4 +1,3 @@
 export interface IServerConfigs {
     api: string;
-    token: string;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@futurebrand/dev-tools",
-  "version": "2.7.0",
+  "version": "2.7.2",
   "description": "FutureBrand Dev Tools",
   "scripts": {
     "build": "tsc && tsc-alias",