@base44-preview/cli 0.0.37-pr.364.f1afd32 → 0.0.37-pr.365.600b1d5

package/dist/cli/index.js

@@ -110477,9 +110477,9 @@ function getMessage2(key2, parameters, self2) {
     assert22.ok(message.length <= parameters.length, `Code: ${key2}; The provided arguments length (${parameters.length}) does not match the required ones (${message.length}).`);
     return Reflect.apply(message, self2, parameters);
   }
-  const regex = /%[dfijoOs]/g;
+  const regex2 = /%[dfijoOs]/g;
   let expectedLength = 0;
-  while (regex.exec(message) !== null)
+  while (regex2.exec(message) !== null)
     expectedLength++;
   assert22.ok(expectedLength === parameters.length, `Code: ${key2}; The provided arguments length (${parameters.length}) does not match the required ones (${expectedLength}).`);
   if (parameters.length === 0)
@@ -111380,9 +111380,9 @@ function convertEndOfLineOptionToCharacter2(endOfLineOption) {
   return endOfLineOption === OPTION_CR2 ? CHARACTER_CR2 : endOfLineOption === OPTION_CRLF2 ? CHARACTER_CRLF2 : DEFAULT_EOL2;
 }
 function countEndOfLineCharacters(text, endOfLineCharacter) {
-  const regex = regexps.get(endOfLineCharacter);
+  const regex2 = regexps.get(endOfLineCharacter);
   if (false) {}
-  return text.match(regex)?.length ?? 0;
+  return text.match(regex2)?.length ?? 0;
 }
 function normalizeEndOfLine(text) {
   return method_replace_all_default2(0, text, END_OF_LINE_REGEXP, CHARACTER_LF2);
@@ -113584,8 +113584,8 @@ function legacyIsNextLineEmpty(text, node, locEnd) {
 }
 function makeString(rawText, enclosingQuote, unescapeUnnecessaryEscapes) {
   const otherQuote = enclosingQuote === '"' ? "'" : '"';
-  const regex = /\\(.)|(["'])/gsu;
-  const raw2 = method_replace_all_default2(0, rawText, regex, (match, escaped, quote) => {
+  const regex2 = /\\(.)|(["'])/gsu;
+  const raw2 = method_replace_all_default2(0, rawText, regex2, (match, escaped, quote) => {
     if (escaped === otherQuote) {
       return escaped;
     }
@@ -117006,17 +117006,17 @@ var init_prettier = __esm(() => {
         }
         const opts = options8 || {};
         const posix = utils3.isWindows(options8);
-        const regex = isState ? picomatch.compileRe(glob, options8) : picomatch.makeRe(glob, options8, false, true);
-        const state = regex.state;
-        delete regex.state;
+        const regex2 = isState ? picomatch.compileRe(glob, options8) : picomatch.makeRe(glob, options8, false, true);
+        const state = regex2.state;
+        delete regex2.state;
         let isIgnored2 = () => false;
         if (opts.ignore) {
           const ignoreOpts = { ...options8, ignore: null, onMatch: null, onResult: null };
           isIgnored2 = picomatch(opts.ignore, ignoreOpts, returnState);
         }
         const matcher = (input, returnObject = false) => {
-          const { isMatch, match, output } = picomatch.test(input, regex, options8, { glob, posix });
-          const result = { glob, state, regex, posix, input, output, match, isMatch };
+          const { isMatch, match, output } = picomatch.test(input, regex2, options8, { glob, posix });
+          const result = { glob, state, regex: regex2, posix, input, output, match, isMatch };
           if (typeof opts.onResult === "function") {
             opts.onResult(result);
           }
@@ -117041,7 +117041,7 @@ var init_prettier = __esm(() => {
         }
         return matcher;
       };
-      picomatch.test = (input, regex, options8, { glob, posix } = {}) => {
+      picomatch.test = (input, regex2, options8, { glob, posix } = {}) => {
         if (typeof input !== "string") {
           throw new TypeError("Expected input to be a string");
         }
@@ -117058,16 +117058,16 @@ var init_prettier = __esm(() => {
         }
         if (match === false || opts.capture === true) {
           if (opts.matchBase === true || opts.basename === true) {
-            match = picomatch.matchBase(input, regex, options8, posix);
+            match = picomatch.matchBase(input, regex2, options8, posix);
           } else {
-            match = regex.exec(output);
+            match = regex2.exec(output);
           }
         }
         return { isMatch: Boolean(match), match, output };
       };
       picomatch.matchBase = (input, glob, options8, posix = utils3.isWindows(options8)) => {
-        const regex = glob instanceof RegExp ? glob : picomatch.makeRe(glob, options8);
-        return regex.test(path152.basename(input));
+        const regex2 = glob instanceof RegExp ? glob : picomatch.makeRe(glob, options8);
+        return regex2.test(path152.basename(input));
       };
       picomatch.isMatch = (str, patterns, options8) => picomatch(patterns, options8)(str);
       picomatch.parse = (pattern, options8) => {
@@ -117087,11 +117087,11 @@ var init_prettier = __esm(() => {
         if (state && state.negated === true) {
           source2 = `^(?!${source2}).*$`;
         }
-        const regex = picomatch.toRegex(source2, options8);
+        const regex2 = picomatch.toRegex(source2, options8);
         if (returnState === true) {
-          regex.state = state;
+          regex2.state = state;
         }
-        return regex;
+        return regex2;
       };
       picomatch.makeRe = (input, options8 = {}, returnOutput = false, returnState = false) => {
         if (!input || typeof input !== "string") {
@@ -117255,8 +117255,8 @@ var init_prettier = __esm(() => {
       };
       micromatch2.capture = (glob, input, options8) => {
         let posix = utils3.isWindows(options8);
-        let regex = picomatch.makeRe(String(glob), { ...options8, capture: true });
-        let match = regex.exec(posix ? utils3.toPosixSlashes(input) : input);
+        let regex2 = picomatch.makeRe(String(glob), { ...options8, capture: true });
+        let match = regex2.exec(posix ? utils3.toPosixSlashes(input) : input);
         if (match) {
           return match.slice(1).map((v10) => v10 === undefined ? "" : v10);
         }
@@ -121695,7 +121695,7 @@ globstar while`, file2, fr10, pattern, pr8, swallowee);
       };
       Object.defineProperty(exports, "__esModule", { value: true });
       var fs42 = __importStar(__require2("fs"));
-      var regex = {
+      var regex2 = {
         section: /^\s*\[(([^#;]|\\#|\\;)+)\]\s*([#;].*)?$/,
         param: /^\s*([\w\.\-\_]+)\s*[=:]\s*(.*?)\s*([#;].*)?$/,
         comment: /^\s*[#;].*$/
@@ -121727,14 +121727,14 @@ globstar while`, file2, fr10, pattern, pr8, swallowee);
         var lines = data.split(/\r\n|\r|\n/);
         lines.forEach(function(line3) {
           var match;
-          if (regex.comment.test(line3)) {
+          if (regex2.comment.test(line3)) {
             return;
           }
-          if (regex.param.test(line3)) {
-            match = line3.match(regex.param);
+          if (regex2.param.test(line3)) {
+            match = line3.match(regex2.param);
             sectionBody[match[1]] = match[2];
-          } else if (regex.section.test(line3)) {
-            match = line3.match(regex.section);
+          } else if (regex2.section.test(line3)) {
+            match = line3.match(regex2.section);
             sectionName = match[1];
             sectionBody = {};
             value.push([sectionName, sectionBody]);
@@ -122820,8 +122820,8 @@ globstar while`, file2, fr10, pattern, pr8, swallowee);
         }
         _make(mode, key2) {
           const str = this.regexPrefix.replace(REGEX_REPLACE_TRAILING_WILDCARD, TRAILING_WILD_CARD_REPLACERS[mode]);
-          const regex = this.ignoreCase ? new RegExp(str, "i") : new RegExp(str);
-          return define2(this, key2, regex);
+          const regex2 = this.ignoreCase ? new RegExp(str, "i") : new RegExp(str);
+          return define2(this, key2, regex2);
         }
       };
       var createRule = ({
@@ -127617,8 +127617,8 @@ var require_prettier = __commonJS((exports, module) => {
   }
   function makeString2(rawText, enclosingQuote, unescapeUnnecessaryEscapes) {
     const otherQuote = enclosingQuote === '"' ? "'" : '"';
-    const regex = /\\(.)|(["'])/gsu;
-    const raw2 = method_replace_all_default3(0, rawText, regex, (match, escaped, quote) => {
+    const regex2 = /\\(.)|(["'])/gsu;
+    const raw2 = method_replace_all_default3(0, rawText, regex2, (match, escaped, quote) => {
       if (escaped === otherQuote) {
         return escaped;
       }
@@ -156661,12 +156661,12 @@ var require_ipaddr = __commonJS((exports, module) => {
         return this.toNormalizedString().replace(/((^|:)(0(:|$))+)/, "::");
       };
       IPv6.prototype.toRFC5952String = function() {
-        var bestMatchIndex, bestMatchLength, match, regex, string4;
-        regex = /((^|:)(0(:|$)){2,})/g;
+        var bestMatchIndex, bestMatchLength, match, regex2, string4;
+        regex2 = /((^|:)(0(:|$)){2,})/g;
         string4 = this.toNormalizedString();
         bestMatchIndex = 0;
         bestMatchLength = -1;
-        while (match = regex.exec(string4)) {
+        while (match = regex2.exec(string4)) {
           if (match[0].length > bestMatchLength) {
             bestMatchIndex = match.index;
             bestMatchLength = match[0].length;
@@ -161984,10 +161984,10 @@ var require_follow_redirects = __commonJS((exports, module) => {
     spread.path = spread.search ? spread.pathname + spread.search : spread.pathname;
     return spread;
   }
-  function removeMatchingHeaders(regex, headers) {
+  function removeMatchingHeaders(regex2, headers) {
     var lastValue;
     for (var header2 in headers) {
-      if (regex.test(header2)) {
+      if (regex2.test(header2)) {
         lastValue = headers[header2];
         delete headers[header2];
       }
@@ -193547,9 +193547,9 @@ var require_dist4 = __commonJS((exports, module) => {
         name2 = "/" + name2;
       let nsp = this._nsps.get(name2);
       if (!nsp) {
-        for (const [regex, parentNamespace] of this.parentNamespacesFromRegExp) {
-          if (regex.test(name2)) {
-            debug("attaching namespace %s to parent namespace %s", name2, regex);
+        for (const [regex2, parentNamespace] of this.parentNamespacesFromRegExp) {
+          if (regex2.test(name2)) {
+            debug("attaching namespace %s to parent namespace %s", name2, regex2);
             return parentNamespace.createChild(name2);
           }
         }
@@ -235383,6 +235383,24 @@ async function login() {
   };
 }
 
+// node_modules/ansi-regex/index.js
+function ansiRegex({ onlyFirst = false } = {}) {
+  const ST = "(?:\\u0007|\\u001B\\u005C|\\u009C)";
+  const osc = `(?:\\u001B\\][\\s\\S]*?${ST})`;
+  const csi = "[\\u001B\\u009B][[\\]()#;?]*(?:\\d{1,4}(?:[;:]\\d{0,4})*)?[\\dA-PR-TZcf-nq-uy=><~]";
+  const pattern = `${osc}|${csi}`;
+  return new RegExp(pattern, onlyFirst ? undefined : "g");
+}
+
+// node_modules/strip-ansi/index.js
+var regex = ansiRegex();
+function stripAnsi(string4) {
+  if (typeof string4 !== "string") {
+    throw new TypeError(`Expected a \`string\`, got \`${typeof string4}\``);
+  }
+  return string4.replace(regex, "");
+}
+
 // node_modules/is-plain-obj/index.js
 function isPlainObject2(value) {
   if (typeof value !== "object" || value === null) {
@@ -241999,16 +242017,35 @@ async function checkForUpgrade() {
 }
 
 // src/cli/utils/upgradeNotification.ts
-function formatUpgradeMessage(info) {
+var UPGRADE_COMMAND = "npm install -g base44@latest";
+function formatUpgradeBox(info) {
   const { shinyOrange } = theme.colors;
   const { bold: bold2 } = theme.styles;
-  return `${shinyOrange("Update available!")} ${shinyOrange(`${info.currentVersion} → ${info.latestVersion}`)}  ${shinyOrange("Run:")} ${bold2(shinyOrange("npm install -g base44@latest"))}`;
+  const lines = [
+    shinyOrange(`Update available! ${info.currentVersion} → ${bold2(info.latestVersion)}`),
+    shinyOrange(`Run: ${bold2(UPGRADE_COMMAND)}`)
+  ];
+  const maxVisualWidth = Math.max(...lines.map((l) => stripAnsi(l).length));
+  const pad = (line) => {
+    const visual = stripAnsi(line).length;
+    return `${line}${" ".repeat(maxVisualWidth - visual)}`;
+  };
+  const top = `┌${"─".repeat(maxVisualWidth + 2)}┐`;
+  const bottom = `└${"─".repeat(maxVisualWidth + 2)}┘`;
+  const body = lines.map((l) => `│ ${pad(l)} │`).join(`
+`);
+  return `${top}
+${body}
+${bottom}`;
+}
+function startUpgradeCheck() {
+  return checkForUpgrade().catch(() => null);
 }
-async function printUpgradeNotificationIfAvailable() {
+async function printUpgradeNotification(upgradeCheckPromise) {
   try {
-    const upgradeInfo = await checkForUpgrade();
+    const upgradeInfo = await upgradeCheckPromise;
     if (upgradeInfo) {
-      R2.message(formatUpgradeMessage(upgradeInfo));
+      R2.warn(formatUpgradeBox(upgradeInfo));
     }
   } catch {}
 }
@@ -242021,7 +242058,7 @@ async function runCommand(commandFn, options, context) {
   } else {
     We(theme.colors.base44OrangeBackground(" Base 44 "));
   }
-  await printUpgradeNotificationIfAvailable();
+  const upgradeCheckPromise = startUpgradeCheck();
   try {
     if (options?.requireAuth) {
       const loggedIn = await isLoggedIn();
@@ -242041,12 +242078,14 @@ async function runCommand(commandFn, options, context) {
       context.errorReporter.setContext({ appId: appConfig.id });
     }
     const result = await commandFn();
+    await printUpgradeNotification(upgradeCheckPromise);
     Le(result.outroMessage || "");
     if (result.stdout) {
       process.stdout.write(result.stdout);
     }
   } catch (error48) {
     displayError(error48);
+    await printUpgradeNotification(upgradeCheckPromise);
     const errorContext = context.errorReporter.getErrorContext();
     Le(theme.format.errorContext(errorContext));
     throw error48;
@@ -244247,8 +244286,9 @@ function createFunctionRouter(manager, logger) {
 var import_nedb = __toESM(require_nedb(), 1);
 
 class Database {
-  collections = new Map;
-  load(entities) {
+  collections;
+  constructor(entities) {
+    this.collections = new Map;
     for (const entity2 of entities) {
       this.collections.set(entity2.name, new import_nedb.default);
     }
@@ -244259,12 +244299,6 @@ class Database {
   getCollectionNames() {
     return Array.from(this.collections.keys());
   }
-  dropAll() {
-    for (const collection of this.collections.values()) {
-      collection.remove({}, { multi: true });
-    }
-    this.collections.clear();
-  }
 }
 
 // node_modules/socket.io/wrapper.mjs
@@ -246241,74 +246275,79 @@ var WATCH_QUEUE_DELAY_MS = 500;
 class WatchBase44 extends EventEmitter4 {
   itemsToWatch;
   logger;
-  entryNames;
-  watchers = new Map;
+  watchers = [];
+  queueWaitForCreation = [];
   queueWaitForCreationTimeout = null;
   constructor(itemsToWatch, logger) {
     super();
     this.itemsToWatch = itemsToWatch;
     this.logger = logger;
-    this.entryNames = Object.keys(itemsToWatch);
   }
   async start() {
-    if (this.watchers.size > 0) {
+    if (this.watchers.length > 0 || this.queueWaitForCreation.length > 0) {
       return;
     }
-    for (const name2 of this.entryNames) {
-      const targetPath = this.itemsToWatch[name2];
-      if (await pathExists(targetPath)) {
-        this.watchers.set(name2, this.watchTarget(name2, targetPath));
+    for (const item of this.itemsToWatch) {
+      if (await pathExists(item.path)) {
+        this.watchers.push(this.watchTarget(item));
+      } else {
+        this.queueWaitForCreation.push(item);
       }
     }
-    this.watchEntries();
+    this.watchCreationQueue();
   }
   async close() {
     if (this.queueWaitForCreationTimeout) {
       clearTimeout(this.queueWaitForCreationTimeout);
       this.queueWaitForCreationTimeout = null;
     }
-    for (const watcher of this.watchers.values()) {
+    for (const watcher of this.watchers) {
       await watcher.close();
     }
-    this.watchers.clear();
+    this.watchers = [];
+    this.queueWaitForCreation = [];
   }
-  watchEntries() {
+  watchCreationQueue() {
     if (this.queueWaitForCreationTimeout) {
       clearTimeout(this.queueWaitForCreationTimeout);
     }
     this.queueWaitForCreationTimeout = setTimeout(async () => {
-      for (const name2 of this.entryNames) {
-        const path19 = this.itemsToWatch[name2];
-        const watchItem = this.watchers.get(name2);
-        const exists = await pathExists(path19);
-        if (!watchItem && exists) {
-          this.emit("change", name2, path19);
-          this.watchers.set(name2, this.watchTarget(name2, path19));
-        } else if (watchItem && !exists) {
-          await watchItem.close();
-          this.emit("change", name2, path19);
-          setTimeout(() => {
-            this.watchers.forEach((watcher, watcherName) => {
-              if (watcher.closed) {
-                this.watchers.delete(watcherName);
-              }
-            });
-          });
+      const toRemove = [];
+      for (const entry of this.queueWaitForCreation) {
+        if (await pathExists(entry.path)) {
+          this.watchers.push(this.watchTarget(entry));
+          toRemove.push(entry);
         }
       }
-      this.queueWaitForCreationTimeout = null;
-      this.watchEntries();
+      this.queueWaitForCreation = this.queueWaitForCreation.filter((entry) => !toRemove.includes(entry));
+      if (this.queueWaitForCreation.length > 0) {
+        this.watchCreationQueue();
+      } else {
+        this.queueWaitForCreationTimeout = null;
+      }
     }, WATCH_QUEUE_DELAY_MS);
   }
-  watchTarget(name2, targetPath) {
-    const watcher = watch(targetPath, {
+  watchTarget(item) {
+    const handler = import_debounce.default(async (_event, path19) => {
+      this.emit("change", item.name, relative4(item.path, path19));
+    }, WATCH_DEBOUNCE_MS);
+    const watcher = watch(item.path, {
       ignoreInitial: true
     });
-    watcher.on("all", import_debounce.default(async (_event, path19) => {
-      this.emit("change", name2, relative4(targetPath, path19));
-    }, WATCH_DEBOUNCE_MS));
+    watcher.on("all", handler);
+    watcher.on("unlinkDir", async (deletedPath) => {
+      if (deletedPath !== item.path) {
+        return;
+      }
+      await watcher.close();
+      this.queueWaitForCreation.push(item);
+      this.watchCreationQueue();
+      setTimeout(() => {
+        this.watchers = this.watchers.filter((watcher2) => !watcher2.closed);
+      });
+    });
     watcher.on("error", (err) => {
-      this.logger.error(`[dev-server] Watch handler failed for ${targetPath}`, err instanceof Error ? err : undefined);
+      this.logger.error(`Watch handler failed for ${item.path}`, err instanceof Error ? err : undefined);
     });
     return watcher;
   }
@@ -246346,8 +246385,7 @@ async function createDevServer(options8) {
   if (functionManager.getFunctionNames().length > 0) {
     R2.info(`Loaded functions: ${functionManager.getFunctionNames().join(", ")}`);
   }
-  const db2 = new Database;
-  db2.load(entities);
+  const db2 = new Database(entities);
   if (db2.getCollectionNames().length > 0) {
     R2.info(`Loaded entities: ${db2.getCollectionNames().join(", ")}`);
   }
@@ -246381,10 +246419,12 @@ async function createDevServer(options8) {
   emitEntityEvent = (appId, entityName, event) => {
     broadcastEntityEvent(io6, appId, entityName, event);
   };
-  const base44ConfigWatcher = new WatchBase44({
-    functions: join18(dirname14(project2.configPath), project2.functionsDir),
-    entities: join18(dirname14(project2.configPath), project2.entitiesDir)
-  }, devLogger);
+  const base44ConfigWatcher = new WatchBase44([
+    {
+      name: "functions",
+      path: join18(dirname14(project2.configPath), project2.functionsDir)
+    }
+  ], devLogger);
   base44ConfigWatcher.on("change", async (name2) => {
     try {
       if (name2 === "functions") {
@@ -246398,18 +246438,6 @@ async function createDevServer(options8) {
           devLogger.log("All functions removed");
         }
       }
-      if (name2 === "entities") {
-        const previousEntityCount = db2.getCollectionNames().length;
-        const { entities: entities2 } = await options8.loadResources();
-        db2.dropAll();
-        if (previousEntityCount > 0) {
-          devLogger.log("Entities directory changed, clearing data...");
-        }
-        db2.load(entities2);
-        if (db2.getCollectionNames().length > 0) {
-          devLogger.log(`Loaded entities: ${db2.getCollectionNames().join(", ")}`);
-        }
-      }
     } catch (error48) {
       const errorMessage = error48 instanceof Error ? error48.message : String(error48);
       devLogger.error(errorMessage);
@@ -249786,9 +249814,9 @@ function matchPropertyGroup(propertyGroup, propertyValues, cohortProperties, deb
     throw new InconclusiveMatchError("can't match cohort without a given cohort property value");
   return propertyGroupType === "AND";
 }
-function isValidRegex(regex) {
+function isValidRegex(regex2) {
   try {
-    new RegExp(regex);
+    new RegExp(regex2);
     return true;
   } catch (err) {
     return false;
@@ -249806,8 +249834,8 @@ function convertToDateTime(value) {
   throw new InconclusiveMatchError(`The date provided ${value} must be a string, number, or date object`);
 }
 function relativeDateParseForFeatureFlagMatching(value) {
-  const regex = /^-?(?<number>[0-9]+)(?<interval>[a-z])$/;
-  const match = value.match(regex);
+  const regex2 = /^-?(?<number>[0-9]+)(?<interval>[a-z])$/;
+  const match = value.match(regex2);
   const parsedDt = new Date(new Date().toISOString());
   if (!match)
     return null;
@@ -250800,4 +250828,4 @@ export {
   CLIExitError
 };
 
-//# debugId=D4D6D0470D70803264756E2164756E21
+//# debugId=BFC56E0BF807E18264756E2164756E21