feat(cli): use proper filepaths

tryabby · Aug 2, 2024 · 192f6e4 · 192f6e4
1 parent 18e5f96
commit 192f6e4
Show file tree

Hide file tree

Showing 31 changed files with 287 additions and 101 deletions.
diff --git a/apps/angular-example/CHANGELOG.md b/apps/angular-example/CHANGELOG.md
@@ -1,5 +1,12 @@
 # angular-example
 
+## 0.0.20
+
+### Patch Changes
+
+- @tryabby/angular@2.0.10
+- @tryabby/devtools@5.0.1
+
 ## 0.0.19
 
 ### Patch Changes

diff --git a/apps/angular-example/package.json b/apps/angular-example/package.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-example",
-  "version": "0.0.19",
+  "version": "0.0.20",
   "private": true,
   "scripts": {
     "ng": "ng",

diff --git a/apps/web/CHANGELOG.md b/apps/web/CHANGELOG.md
@@ -1,5 +1,14 @@
 # web
 
+## 0.2.38
+
+### Patch Changes
+
+- Updated dependencies
+  - @tryabby/core@5.4.0
+  - @tryabby/devtools@5.0.1
+  - @tryabby/next@5.1.3
+
 ## 0.2.37
 
 ### Patch Changes

diff --git a/apps/web/package.json b/apps/web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "web",
-  "version": "0.2.37",
+  "version": "0.2.38",
   "private": true,
   "scripts": {
     "build": "next build",

diff --git a/packages/angular/CHANGELOG.md b/packages/angular/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @tryabby/angular
 
+## 2.0.10
+
+### Patch Changes
+
+- Updated dependencies
+  - @tryabby/core@5.4.0
+
 ## 2.0.9
 
 ### Patch Changes

diff --git a/packages/angular/package.json b/packages/angular/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tryabby/angular",
-  "version": "2.0.9",
+  "version": "2.0.10",
   "scripts": {
     "ng": "ng",
     "start": "ng serve",

diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @tryabby/cli
 
+## 1.2.0
+
+### Minor Changes
+
+- update ai command
+
 ## 1.1.1
 
 ### Patch Changes

diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tryabby/cli",
-  "version": "1.1.1",
+  "version": "1.2.0",
   "private": false,
   "main": "./dist/index.js",
   "bin": {
@@ -28,9 +28,10 @@
     "esbuild": "0.18.17",
     "figlet": "^1.6.0",
     "globby": "^14.0.2",
-    "magicast": "^0.3.2",
+    "magicast": "^0.3.4",
     "msw": "^1.2.2",
     "node-fetch": "^3.3.1",
+    "ora": "^8.0.1",
     "polka": "^0.5.2",
     "portfinder": "^1.0.32",
     "prettier": "^3.0.0",

diff --git a/packages/cli/src/add-flag.ts b/packages/cli/src/add-flag.ts
@@ -6,9 +6,9 @@ import { push } from "./push";
 import { updateConfigFile } from "./update-config-file";
 
 export async function addFlag(options: { apiKey: string; host?: string; configPath?: string }) {
-  const { mutableConfig, saveMutableConfig, restoreConfig } = await loadLocalConfig(
-    options.configPath
-  );
+  const { mutableConfig, saveMutableConfig, restoreConfig } = await loadLocalConfig({
+    configPath: options.configPath,
+  });
 
   const { flagName } = await prompts({
     type: "text",

diff --git a/packages/cli/src/add-remote-config.ts b/packages/cli/src/add-remote-config.ts
@@ -9,9 +9,9 @@ export async function addRemoteConfig(options: {
   host?: string;
   configPath?: string;
 }) {
-  const { mutableConfig, saveMutableConfig, restoreConfig } = await loadLocalConfig(
-    options.configPath
-  );
+  const { mutableConfig, saveMutableConfig, restoreConfig } = await loadLocalConfig({
+    configPath: options.configPath,
+  });
 
   const { remoteConfigName, remoteConfigType } = await prompts([
     {

diff --git a/packages/cli/src/ai.ts b/packages/cli/src/ai.ts
@@ -4,6 +4,7 @@ import { getUseFeatureFlagRegex } from "@tryabby/core";
 import { readFile } from "fs/promises";
 import chalk from "chalk";
 import { HttpService } from "./http";
+import * as path from "path";
 
 export async function removeFlagInstance(options: {
   flagName: string;
@@ -13,8 +14,7 @@ export async function removeFlagInstance(options: {
   configPath?: string;
 }) {
   const files = await globby("**/*.tsx", {
-    cwd: options.path ?? process.cwd(),
-    absolute: true,
+    cwd: options.path,
     gitignore: true,
     onlyFiles: true,
   });
@@ -23,7 +23,8 @@ export async function removeFlagInstance(options: {
 
   const filesToUse = (
     await Promise.all(
-      files.flatMap(async (filePath) => {
+      files.flatMap(async (fp) => {
+        const filePath = path.join(options.path, fp);
         const content = await readFile(filePath, "utf-8").then((content) => {
           const matches = content.match(regex);
           return matches ? content : null;
@@ -45,14 +46,26 @@ export async function removeFlagInstance(options: {
     apiUrl: options.host,
   });
 
+  let updatedFileCount = filesToUse.length;
   try {
-    const { mutableConfig, saveMutableConfig } = await loadLocalConfig(
-      options.configPath
+    const { mutableConfig, saveMutableConfig } = await loadLocalConfig({
+      configPath: options.configPath,
+      cwd: options.path,
+    });
+
+    if (mutableConfig.flags === undefined) {
+      console.error("No flags found in the config file");
+      return;
+    }
+
+    mutableConfig.flags = Array.from(mutableConfig.flags).filter(
+      (flag) => flag !== options.flagName
     );
-    mutableConfig.flags = mutableConfig.flags.filter((flag: string) => flag !== options.flagName);
+    updatedFileCount++;
     await saveMutableConfig();
   } catch (e) {
+    console.error(e);
     // fail silently
   }
-  console.log(chalk.green("Flag removed successfully"));
+  return updatedFileCount;
 }
diff --git a/packages/cli/src/check.ts b/packages/cli/src/check.ts
@@ -16,7 +16,7 @@ export async function verifyLocalConfig({
   apiUrl?: string;
   configPath?: string;
 }) {
-  const { config: localConfig } = await loadLocalConfig(configPath);
+  const { config: localConfig } = await loadLocalConfig({ configPath });
 
   const remoteConfig = await HttpService.getConfigFromServer({
     projectId: localConfig.projectId,

diff --git a/packages/cli/src/http.ts b/packages/cli/src/http.ts
@@ -104,9 +104,7 @@ export abstract class HttpService {
         if (!Array.isArray(res)) {
           throw new Error("Invalid response from server");
         }
-        console.log({ res, files });
         await Promise.all(res.map((file) => writeFile(file.filePath, file.fileContent)));
-        console.log(chalk.green("All files have been updated successfully"));
       } else if (status === 500) {
         throw new Error("Internal server error trying to update files");
       } else if (status === 401) {

diff --git a/packages/cli/src/index.ts b/packages/cli/src/index.ts
@@ -14,6 +14,7 @@ import { addCommandTypeSchema } from "./schemas";
 import { addFlag } from "./add-flag";
 import { addRemoteConfig } from "./add-remote-config";
 import { removeFlagInstance } from "./ai";
+import ora from "ora";
 
 const program = new Command();
 
@@ -195,14 +196,17 @@ aiCommand
   .addOption(ConfigOption)
   .addOption(HostOption)
   .action(async (dir: string, flagName: string, options: { config?: string; host?: string }) => {
-    const files = await removeFlagInstance({
+    const spinner = ora("Removing feature flag with ✨AI✨").start();
+    const updatedFileCount = await removeFlagInstance({
       apiKey: await getToken(),
       flagName,
       path: dir,
       configPath: options.config,
       host: options.host,
     });
-    console.log(files);
+    spinner.succeed();
+    console.log(chalk.green("\nFlag removed successfully"));
+    console.log(chalk.green("Files updated:", updatedFileCount));
   });
 
 program.parse(process.argv);
diff --git a/packages/cli/src/pull.ts b/packages/cli/src/pull.ts
@@ -24,7 +24,7 @@ export async function pullAndMerge({
   apiUrl?: string;
   configPath?: string;
 }): Promise<void> {
-  const { config: localConfig, configFilePath } = await loadLocalConfig(configPath);
+  const { config: localConfig, configFilePath } = await loadLocalConfig({ configPath });
 
   const configFileContents = await fs.readFile(configFilePath, "utf-8");
 

diff --git a/packages/cli/src/push.ts b/packages/cli/src/push.ts
@@ -10,7 +10,7 @@ export async function push({
   apiUrl?: string;
   configPath?: string;
 }) {
-  const { config } = await loadLocalConfig(configPath);
+  const { config } = await loadLocalConfig({ configPath });
 
   await HttpService.updateConfigOnServer({
     apiKey,

diff --git a/packages/cli/src/util.ts b/packages/cli/src/util.ts
@@ -1,4 +1,4 @@
-import { abbyConfigSchema } from "@tryabby/core";
+import { AbbyConfig, abbyConfigSchema } from "@tryabby/core";
 import { loadConfig } from "unconfig";
 import { config as loadEnv } from "dotenv";
 import path from "path";
@@ -8,11 +8,18 @@ import { ABBY_BASE_URL } from "./consts";
 import cors from "cors";
 import fs from "fs/promises";
 import { writeFile, loadFile, parseModule } from "magicast";
+import { chownSync } from "fs";
 
-export async function loadLocalConfig(configPath?: string) {
-  loadEnv();
+export async function loadLocalConfig({
+  configPath,
+  cwd: initialCwd,
+}: {
+  configPath?: string;
+  cwd?: string;
+}) {
+  loadEnv({ path: initialCwd ? path.resolve(initialCwd, ".env") : "" });
 
-  let cwd = process.cwd();
+  let cwd = initialCwd ?? process.cwd();
   let fileName = "abby.config";
   let extensions = ["ts", "js", "mjs", "cjs"];
 
@@ -49,7 +56,7 @@ export async function loadLocalConfig(configPath?: string) {
   return {
     config: result.data,
     configFilePath: sources[0],
-    mutableConfig: mod.exports.default.$args[1],
+    mutableConfig: mod.exports.default.$args[1] as AbbyConfig,
     saveMutableConfig: () => writeFile(mod, sources[0]),
     restoreConfig: () => {
       const mod = parseModule(originalConfig);

diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @tryabby/core
 
+## 5.4.0
+
+### Minor Changes
+
+- update ai command
+
 ## 5.3.1
 
 ### Patch Changes

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tryabby/core",
-  "version": "5.3.1",
+  "version": "5.4.0",
   "description": "",
   "main": "dist/index.js",
   "files": [

diff --git a/packages/core/src/shared/schemas.ts b/packages/core/src/shared/schemas.ts
@@ -1,5 +1,6 @@
 import { z } from "zod";
 import { AbbyEventType } from "./types";
+import { AbbyConfig } from "..";
 
 export const abbyEventSchema = z.object({
   type: z.nativeEnum(AbbyEventType),
@@ -25,7 +26,7 @@ export const remoteConfigValueStringSchema = z.union([
 export const abbyConfigSchema = z.object({
   projectId: z.string(),
   apiUrl: z.string().optional(),
-  currentEnvironment: z.string().optional(),
+  currentEnvironment: z.string(),
   environments: z.array(z.string()),
   tests: z
     .record(
@@ -59,7 +60,14 @@ export const abbyConfigSchema = z.object({
     })
     .optional(),
   debug: z.boolean().optional(),
-});
+  cookies: z
+    .object({
+      disableByDefault: z.boolean().optional(),
+      expiresInDays: z.number().optional(),
+    })
+    .optional(),
+  __experimentalCdnUrl: z.string().optional(),
+}) satisfies z.ZodType<AbbyConfig>;
 
 export type AbbyConfigFile = z.infer<typeof abbyConfigSchema>;
 
@@ -75,7 +83,7 @@ export type RemoteConfigValueString = z.infer<typeof remoteConfigValueStringSche
 export type RemoteConfigValueStringToType<T extends RemoteConfigValueString> = T extends "String"
   ? string
   : T extends "Number"
-  ? number
-  : T extends "JSON"
-  ? Record<string, unknown>
-  : never;
+    ? number
+    : T extends "JSON"
+      ? Record<string, unknown>
+      : never;
diff --git a/packages/next/CHANGELOG.md b/packages/next/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @tryabby/next
 
+## 5.1.3
+
+### Patch Changes
+
+- @tryabby/react@5.2.2
+
 ## 5.1.2
 
 ### Patch Changes

diff --git a/packages/next/package.json b/packages/next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tryabby/next",
-  "version": "5.1.2",
+  "version": "5.1.3",
   "description": "",
   "main": "dist/index.js",
   "files": [

diff --git a/packages/node/CHANGELOG.md b/packages/node/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @tryabby/node
 
+## 5.1.8
+
+### Patch Changes
+
+- Updated dependencies
+  - @tryabby/core@5.4.0
+
 ## 5.1.7
 
 ### Patch Changes

diff --git a/packages/node/package.json b/packages/node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tryabby/node",
-  "version": "5.1.7",
+  "version": "5.1.8",
   "description": "",
   "main": "dist/index.js",
   "files": [