@mongoosejs/studio 0.2.0 → 0.2.2

package/eslint.config.js

@@ -33,6 +33,7 @@ module.exports = defineConfig([
         CodeMirror: true,
         Chart: true,
         URLSearchParams: true,
+        URL: true,
         fetch: true,
         __dirname: true,
         process: true,

package/frontend/public/app.js

@@ -301,9 +301,9 @@ function getAutocompleteContext(searchText, cursorPos) {
   
   // Check if we're in a value context (after a colon)
   // Match the last colon followed by optional whitespace and capture everything after
-  const valueMatch = before.match(/:\s*([^\s,\}\]:]*)$/);
+  const valueMatch = before.match(/:\s*(\{?\s*)([^\s,\}\]:]*)$/);
   if (valueMatch) {
-    const token = valueMatch[1];
+    const token = valueMatch[2];
     return {
       token,
       role: 'value',
@@ -378,9 +378,9 @@ function applySuggestion(searchText, cursorPos, suggestion) {
   const after = searchText.slice(cursorPos);
   
   // Check if we're in a value context
-  const valueMatch = before.match(/:\s*([^\s,\}\]:]*)$/);
+  const valueMatch = before.match(/:\s*(\{?\s*)([^\s,\}\]:]*)$/);
   if (valueMatch) {
-    const token = valueMatch[1];
+    const token = valueMatch[2];
     const start = cursorPos - token.length;
     let replacement = suggestion;
     let cursorOffset = replacement.length;
@@ -4456,18 +4456,21 @@ app.component('app-component', {
           return;
         }
 
+        window.localStorage.setItem('_mongooseStudioAccessToken', accessToken._id);
+
         try {
           const { nodeEnv } = await api.status();
           this.nodeEnv = nodeEnv;
         } catch (err) {
           this.authError = 'Error connecting to Mongoose Studio API: ' + err.response?.data?.message ?? err.message;
           this.status = 'loaded';
+          window.localStorage.setItem('_mongooseStudioAccessToken', '');
           return;
         }
 
         this.user = user;
         this.roles = roles;
-        window.localStorage.setItem('_mongooseStudioAccessToken', accessToken._id);
+        
         setTimeout(() => {
           this.$router.replace(this.$router.currentRoute.value.path);
         }, 0);
@@ -6293,12 +6296,21 @@ client.interceptors.request.use(req => {
   return req;
 });
 
+function sanitizedReturnUrl() {
+  const url = new URL(window.location.href);
+  if (url.hash && url.hash.includes('?')) {
+    const [hashPath, hashSearch] = url.hash.split('?', 2);
+    url.hash = hashPath;
+  }
+  return url.toString();
+}
+
 exports.githubLogin = function githubLogin() {
-  return client.post('/githubLogin', { state: window.location.href }).then(res => res.data);
+  return client.post('/githubLogin', { state: sanitizedReturnUrl() }).then(res => res.data);
 };
 
 exports.googleLogin = function googleLogin() {
-  return client.post('/googleLogin', { state: window.location.href }).then(res => res.data);
+  return client.post('/googleLogin', { state: sanitizedReturnUrl() }).then(res => res.data);
 };
 
 exports.getWorkspaceTeam = function getWorkspaceTeam() {
@@ -32234,7 +32246,7 @@ const compile = () => {
 (module) {
 
 "use strict";
-module.exports = /*#__PURE__*/JSON.parse('{"name":"@mongoosejs/studio","version":"0.2.0","description":"A Mongoose-native MongoDB UI with schema-aware autocomplete, AI-assisted queries, and dashboards that understand your models - not just your data.","homepage":"https://mongoosestudio.app/","repository":{"type":"git","url":"https://github.com/mongoosejs/studio"},"license":"Apache-2.0","dependencies":{"@ai-sdk/anthropic":"2.x","@ai-sdk/google":"2.x","@ai-sdk/openai":"2.x","ai":"5.x","archetype":"0.13.1","csv-stringify":"6.3.0","ejson":"^2.2.3","extrovert":"^0.2.0","marked":"15.0.12","node-inspect-extracted":"3.x","tailwindcss":"3.4.0","vue":"3.x","vue-toastification":"^2.0.0-rc.5","webpack":"5.x"},"peerDependencies":{"mongoose":"7.x || 8.x || ^9.0.0"},"devDependencies":{"@masteringjs/eslint-config":"0.1.1","axios":"1.2.2","dedent":"^1.6.0","eslint":"9.30.0","express":"4.x","mocha":"10.2.0","mongoose":"9.x"},"scripts":{"lint":"eslint .","tailwind":"tailwindcss -o ./frontend/public/tw.css","tailwind:watch":"tailwindcss -o ./frontend/public/tw.css --watch","test":"mocha test/*.test.js"}}');
+module.exports = /*#__PURE__*/JSON.parse('{"name":"@mongoosejs/studio","version":"0.2.2","description":"A Mongoose-native MongoDB UI with schema-aware autocomplete, AI-assisted queries, and dashboards that understand your models - not just your data.","homepage":"https://mongoosestudio.app/","repository":{"type":"git","url":"https://github.com/mongoosejs/studio"},"license":"Apache-2.0","dependencies":{"@ai-sdk/anthropic":"2.x","@ai-sdk/google":"2.x","@ai-sdk/openai":"2.x","ai":"5.x","archetype":"0.13.1","csv-stringify":"6.3.0","ejson":"^2.2.3","extrovert":"^0.2.0","marked":"15.0.12","node-inspect-extracted":"3.x","tailwindcss":"3.4.0","vue":"3.x","vue-toastification":"^2.0.0-rc.5","webpack":"5.x"},"peerDependencies":{"mongoose":"7.x || 8.x || ^9.0.0"},"devDependencies":{"@masteringjs/eslint-config":"0.1.1","axios":"1.2.2","dedent":"^1.6.0","eslint":"9.30.0","express":"4.x","mocha":"10.2.0","mongoose":"9.x"},"scripts":{"lint":"eslint .","tailwind":"tailwindcss -o ./frontend/public/tw.css","tailwind:watch":"tailwindcss -o ./frontend/public/tw.css --watch","test":"mocha test/*.test.js"}}');
 
 /***/ }
 

package/frontend/public/index.html

@@ -13,7 +13,7 @@
     <link rel="stylesheet" href="https://unpkg.com/codemirror@5.65.16/lib/codemirror.css">
     <link rel="stylesheet" href="https://unpkg.com/leaflet@1.9.4/dist/leaflet.css"/>
     <link rel="icon" href="images/logo.svg" type="image/svg+xml">
-    <script src="config.js"></script>
+    <script src="./config.js"></script>
     <script src="https://unpkg.com/vue@3.x"></script>
     <script src="https://unpkg.com/vue-router@4.0.10"></script>
     <script src="https://unpkg.com/chart.js@4.2.0/dist/chart.umd.js"></script>
@@ -27,6 +27,6 @@
 
     <script src="https://unpkg.com/prismjs@1.29.0/prism.js" data-manual="true"></script>
     <script src="https://unpkg.com/chart.js@4.2.0/dist/chart.umd.js"></script>
-    <script src="app.js"></script>
+    <script src="./app.js"></script>
   </body>
 </html>

package/frontend/src/_util/document-search-autocomplete.js

@@ -82,9 +82,9 @@ function getAutocompleteContext(searchText, cursorPos) {
   
   // Check if we're in a value context (after a colon)
   // Match the last colon followed by optional whitespace and capture everything after
-  const valueMatch = before.match(/:\s*([^\s,\}\]:]*)$/);
+  const valueMatch = before.match(/:\s*(\{?\s*)([^\s,\}\]:]*)$/);
   if (valueMatch) {
-    const token = valueMatch[1];
+    const token = valueMatch[2];
     return {
       token,
       role: 'value',
@@ -159,9 +159,9 @@ function applySuggestion(searchText, cursorPos, suggestion) {
   const after = searchText.slice(cursorPos);
   
   // Check if we're in a value context
-  const valueMatch = before.match(/:\s*([^\s,\}\]:]*)$/);
+  const valueMatch = before.match(/:\s*(\{?\s*)([^\s,\}\]:]*)$/);
   if (valueMatch) {
-    const token = valueMatch[1];
+    const token = valueMatch[2];
     const start = cursorPos - token.length;
     let replacement = suggestion;
     let cursorOffset = replacement.length;

package/frontend/src/index.js

@@ -102,18 +102,21 @@ app.component('app-component', {
           return;
         }
 
+        window.localStorage.setItem('_mongooseStudioAccessToken', accessToken._id);
+
         try {
           const { nodeEnv } = await api.status();
           this.nodeEnv = nodeEnv;
         } catch (err) {
           this.authError = 'Error connecting to Mongoose Studio API: ' + err.response?.data?.message ?? err.message;
           this.status = 'loaded';
+          window.localStorage.setItem('_mongooseStudioAccessToken', '');
           return;
         }
 
         this.user = user;
         this.roles = roles;
-        window.localStorage.setItem('_mongooseStudioAccessToken', accessToken._id);
+        
         setTimeout(() => {
           this.$router.replace(this.$router.currentRoute.value.path);
         }, 0);

package/frontend/src/mothership.js

@@ -18,12 +18,21 @@ client.interceptors.request.use(req => {
   return req;
 });
 
+function sanitizedReturnUrl() {
+  const url = new URL(window.location.href);
+  if (url.hash && url.hash.includes('?')) {
+    const [hashPath, hashSearch] = url.hash.split('?', 2);
+    url.hash = hashPath;
+  }
+  return url.toString();
+}
+
 exports.githubLogin = function githubLogin() {
-  return client.post('/githubLogin', { state: window.location.href }).then(res => res.data);
+  return client.post('/githubLogin', { state: sanitizedReturnUrl() }).then(res => res.data);
 };
 
 exports.googleLogin = function googleLogin() {
-  return client.post('/googleLogin', { state: window.location.href }).then(res => res.data);
+  return client.post('/googleLogin', { state: sanitizedReturnUrl() }).then(res => res.data);
 };
 
 exports.getWorkspaceTeam = function getWorkspaceTeam() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mongoosejs/studio",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "description": "A Mongoose-native MongoDB UI with schema-aware autocomplete, AI-assisted queries, and dashboards that understand your models - not just your data.",
   "homepage": "https://mongoosestudio.app/",
   "repository": {