@difizen/libro-sql-cell 0.2.40 → 0.2.41

package/es/libro-formatter-sql-magic-contribution.d.ts

@@ -1,3 +1,4 @@
+/** @format */
 import { FormatterContribution } from '@difizen/libro-jupyter';
 import type { DefaultEncodedFormatter, DefaultDecodedFormatter } from '@difizen/libro-jupyter';
 export interface SqlDecodedFormatter extends DefaultDecodedFormatter {

package/es/libro-formatter-sql-magic-contribution.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"libro-formatter-sql-magic-contribution.d.ts","sourceRoot":"","sources":["../src/libro-formatter-sql-magic-contribution.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,KAAK,EACV,uBAAuB,EACvB,uBAAuB,EACxB,MAAM,wBAAwB,CAAC;AAGhC,MAAM,WAAW,mBAAoB,SAAQ,uBAAuB;IAClE,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,qBACa,6BACX,YAAW,qBAAqB,CAAC,mBAAmB,CAAC;IAErD,SAAS,SAAyB;IAClC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAE1B,SAAS,mBAAoB,MAAM,aAEjC;IACF,MAAM,WAAY,mBAAmB;;;;;MAQnC;IACF,MAAM,mBAAoB,uBAAuB;;;;;;;;MAiB/C;IAEF,QAAQ,WAAY,mBAAmB,mCAErC;CACH"}
+{"version":3,"file":"libro-formatter-sql-magic-contribution.d.ts","sourceRoot":"","sources":["../src/libro-formatter-sql-magic-contribution.ts"],"names":[],"mappings":"AAAA,cAAc;AAGd,OAAO,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,KAAK,EACV,uBAAuB,EACvB,uBAAuB,EACxB,MAAM,wBAAwB,CAAC;AAGhC,MAAM,WAAW,mBAAoB,SAAQ,uBAAuB;IAClE,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,qBACa,6BACX,YAAW,qBAAqB,CAAC,mBAAmB,CAAC;IAErD,SAAS,SAAyB;IAClC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAE1B,SAAS,mBAAoB,MAAM,aAEjC;IACF,MAAM,WAAY,mBAAmB;;;;;MAanC;IACF,MAAM,mBAAoB,uBAAuB;;;;;;;;MAqB/C;IAEF,QAAQ,WAAY,mBAAmB,mCAErC;CACH"}

package/es/libro-formatter-sql-magic-contribution.js

@@ -5,7 +5,8 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-/* eslint-disable @typescript-eslint/no-unused-vars */
+/** @format */
+
 import { concatMultilineString } from '@difizen/libro-common';
 import { FormatterContribution } from '@difizen/libro-jupyter';
 import { singleton } from '@difizen/mana-app';
@@ -20,7 +21,12 @@ export var FormatterSqlMagicContribution = (_dec = singleton({
     return libroFormatter === _this.formatter ? 100 : 1;
   };
   this.encode = function (source) {
-    var sqlEncodedValue = "%%sql \n{\"result_variable\":\"".concat(source.result_variable, "\", \"db_id\":\"").concat(source.db_id, "\",\"sql_script\":\"").concat(source.value, "\"}");
+    var sqlJson = {
+      result_variable: source.result_variable,
+      db_id: source.db_id,
+      sql_script: source.value
+    };
+    var sqlEncodedValue = "%%sql \n".concat(JSON.stringify(sqlJson));
     return {
       source: sqlEncodedValue,
       metadata: {
@@ -32,15 +38,19 @@ export var FormatterSqlMagicContribution = (_dec = singleton({
     var value = concatMultilineString(formatterValue.source);
     if (value.startsWith('%%sql \n')) {
       var run = value.split('%%sql \n')[1];
-      var runValue = JSON.parse(run);
-      var result_variable = runValue.result_variable;
-      var db_id = runValue.db_id;
-      var codeValue = runValue.sql_script;
-      return {
-        result_variable: result_variable,
-        value: codeValue,
-        db_id: db_id
-      };
+      try {
+        var runValue = JSON.parse(run);
+        var result_variable = runValue.result_variable;
+        var db_id = runValue.db_id;
+        var codeValue = runValue.sql_script;
+        return {
+          result_variable: result_variable,
+          value: codeValue,
+          db_id: db_id
+        };
+      } catch (e) {
+        console.warn('🚀 ~ e:', e);
+      }
     }
     return {
       value: ''

package/es/libro-sql-cell-view.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"libro-sql-cell-view.d.ts","sourceRoot":"","sources":["../src/libro-sql-cell-view.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,KAAK,EAAa,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAEhE,OAAO,KAAK,EACV,eAAe,EAGf,SAAS,EACT,aAAa,EACd,MAAM,wBAAwB,CAAC;AAChC,OAAO,EACL,WAAW,EACX,YAAY,EAEZ,+BAA+B,EAC/B,gBAAgB,EAIhB,eAAe,EAChB,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EACL,QAAQ,EAQR,WAAW,EAGZ,MAAM,mBAAmB,CAAC;AAK3B,OAAO,KAAK,MAAM,OAAO,CAAC;AAG1B,OAAO,cAAc,CAAC;AACtB,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AACnE,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAsHvD,eAAO,MAAM,YAAY,sEA6ExB,CAAC;AAEF,qBAEa,gBAAiB,SAAQ,+BAA+B;IAC1D,IAAI,uEAAgB;IACrB,KAAK,EAAE,iBAAiB,CAAC;IACjC,gBAAgB,EAAE,gBAAgB,CAAC;IAEnC,OAAO,EAAE,OAAO,EAAE,CAAC;IAGnB,SAAS,EAAE,cAAc,EAAE,CAAM;IAGxB,YAAY,EAAE,YAAY,CAA0B;IAG7D,gBAAgB,SAAK;IAGZ,kBAAkB,SAAK;IAEb,SAAS,EAAE,SAAS,CAAC;IAExC,SAAS,CAAC,uBAAuB,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAwB;IAEzE,IAAI,WAAW,kBAEd;IAEQ,YAAY,uDAMnB;IAGO,gBAAgB;IAIzB,oBAAoB;IAuBpB,SAAS,CAAC,kBAAkB,4BAAmC;IAC/D,IAAI,eAAe,6BAElB;gBAGqB,OAAO,EAAE,eAAe,EACvB,WAAW,EAAE,WAAW,EACxB,WAAW,EAAE,WAAW,EACnB,gBAAgB,EAAE,gBAAgB,EACjC,iBAAiB,EAAE,iBAAiB;IAsCxD,WAAW,sBAElB;IAEF,aAAa,CAAC,GAAG,EAAE,GAAG;IAKb,YAAY,SAAU,QAAQ,KAAG,IAAI,CAK5C;IAEF,cAAc,CAAC,KAAK,EAAE,MAAM;IAInB,MAAM,IAAI,SAAS;IASnB,KAAK,WAAY,OAAO,UAU/B;IAEO,cAAc,aAGrB;IAEa,GAAG;IAqElB,KAAK,YACM,cAAc,kBAAkB,CAAC,SAAS,CAAC,oBAClC,cAAc,aAAa,KAAK,GAAG,6CAUrD;IAEF,mBAAmB,aACP,cAAc,aAAa,eACxB,MAAM,KAAK,IAAI,UA6B5B;IAEF,iBAAiB,gDAef;CACH"}
+{"version":3,"file":"libro-sql-cell-view.d.ts","sourceRoot":"","sources":["../src/libro-sql-cell-view.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,KAAK,EAAa,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAEhE,OAAO,KAAK,EACV,eAAe,EAGf,SAAS,EACT,aAAa,EACd,MAAM,wBAAwB,CAAC;AAChC,OAAO,EACL,WAAW,EACX,YAAY,EAEZ,+BAA+B,EAC/B,gBAAgB,EAIhB,eAAe,EAChB,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EACL,QAAQ,EAQR,WAAW,EAGZ,MAAM,mBAAmB,CAAC;AAK3B,OAAO,KAAK,MAAM,OAAO,CAAC;AAG1B,OAAO,cAAc,CAAC;AACtB,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AACnE,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAsHvD,eAAO,MAAM,YAAY,sEA0FxB,CAAC;AAEF,qBAEa,gBAAiB,SAAQ,+BAA+B;IAC1D,IAAI,uEAAgB;IACrB,KAAK,EAAE,iBAAiB,CAAC;IACjC,gBAAgB,EAAE,gBAAgB,CAAC;IAEnC,OAAO,EAAE,OAAO,EAAE,CAAC;IAGnB,SAAS,EAAE,cAAc,EAAE,CAAM;IAGxB,YAAY,EAAE,YAAY,CAA0B;IAG7D,gBAAgB,SAAK;IAGZ,kBAAkB,SAAK;IAEb,SAAS,EAAE,SAAS,CAAC;IAExC,SAAS,CAAC,uBAAuB,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAwB;IAEzE,IAAI,WAAW,kBAEd;IAEQ,YAAY,uDAMnB;IAGO,gBAAgB;IAIzB,oBAAoB;IAuBpB,SAAS,CAAC,kBAAkB,4BAAmC;IAC/D,IAAI,eAAe,6BAElB;gBAGqB,OAAO,EAAE,eAAe,EACvB,WAAW,EAAE,WAAW,EACxB,WAAW,EAAE,WAAW,EACnB,gBAAgB,EAAE,gBAAgB,EACjC,iBAAiB,EAAE,iBAAiB;IAkDxD,WAAW,sBAElB;IAEF,aAAa,CAAC,GAAG,EAAE,GAAG;IAKb,YAAY,SAAU,QAAQ,KAAG,IAAI,CAK5C;IAEF,cAAc,CAAC,KAAK,EAAE,MAAM;IAInB,MAAM,IAAI,SAAS;IASnB,KAAK,WAAY,OAAO,UAU/B;IAEO,cAAc,aAGrB;IAEa,GAAG;IAqElB,KAAK,YACM,cAAc,kBAAkB,CAAC,SAAS,CAAC,oBAClC,cAAc,aAAa,KAAK,GAAG,6CAUrD;IAEF,mBAAmB,aACP,cAAc,aAAa,eACxB,MAAM,KAAK,IAAI,UA6B5B;IAEF,iBAAiB,gDAef;CACH"}

package/es/libro-sql-cell-view.js

@@ -157,7 +157,17 @@ export var LibroSqlCell = /*#__PURE__*/React.forwardRef(function SqlEditorViewCo
     setEdit(false);
   };
   useEffect(function () {
-    instance.getDatabaseConfig();
+    instance.getDatabaseConfig().then(function () {
+      if (instance.model.dbId) {
+        setSelectedDb(instance.model.dbId);
+      } else {
+        instance.handleDbChange(instance.databases[0].id);
+        setSelectedDb(instance.databases[0].id);
+      }
+      return;
+    }).catch(function () {
+      //
+    });
   }, [instance]);
   var handleChange = function handleChange(value) {
     instance.handleDbChange(value);
@@ -409,6 +419,16 @@ export var LibroSqlCellView = (_dec = transient(), _dec2 = view('libro-sql-cell-
         return cell.model.type === 'sql';
       }));
     }
+    _this.parentReady.then(function () {
+      if (_this.parent.model.onRestart) {
+        _this.parent.model.onRestart(function () {
+          _this.getDatabaseConfig();
+        });
+      }
+      return;
+    }).catch(function () {
+      //
+    });
     return _this;
   }
   LibroSqlCellView = inject(CodeEditorManager)(LibroSqlCellView, undefined, 4) || LibroSqlCellView;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@difizen/libro-sql-cell",
-  "version": "0.2.40",
+  "version": "0.2.41",
   "description": "",
   "keywords": [
     "libro",
@@ -32,10 +32,10 @@
     "src"
   ],
   "dependencies": {
-    "@difizen/libro-code-editor": "^0.2.40",
-    "@difizen/libro-jupyter": "^0.2.40",
-    "@difizen/libro-rendermime": "^0.2.40",
-    "@difizen/libro-common": "^0.2.40",
+    "@difizen/libro-code-editor": "^0.2.41",
+    "@difizen/libro-jupyter": "^0.2.41",
+    "@difizen/libro-rendermime": "^0.2.41",
+    "@difizen/libro-common": "^0.2.41",
     "@ant-design/icons": "^5.1.0",
     "@difizen/mana-app": "latest",
     "@difizen/mana-l10n": "latest"

package/src/libro-formatter-sql-magic-contribution.ts

@@ -1,4 +1,5 @@
-/* eslint-disable @typescript-eslint/no-unused-vars */
+/** @format */
+
 import { concatMultilineString } from '@difizen/libro-common';
 import { FormatterContribution } from '@difizen/libro-jupyter';
 import type {
@@ -23,7 +24,12 @@ export class FormatterSqlMagicContribution
     return libroFormatter === this.formatter ? 100 : 1;
   };
   encode = (source: SqlDecodedFormatter) => {
-    const sqlEncodedValue = `%%sql \n{"result_variable":"${source.result_variable}", "db_id":"${source.db_id}","sql_script":"${source.value}"}`;
+    const sqlJson = {
+      result_variable: source.result_variable,
+      db_id: source.db_id,
+      sql_script: source.value,
+    };
+    const sqlEncodedValue = `%%sql \n${JSON.stringify(sqlJson)}`;
     return {
       source: sqlEncodedValue,
       metadata: {
@@ -35,15 +41,19 @@ export class FormatterSqlMagicContribution
     const value = concatMultilineString(formatterValue.source);
     if (value.startsWith('%%sql \n')) {
       const run = value.split('%%sql \n')[1];
-      const runValue = JSON.parse(run);
-      const result_variable: string = runValue.result_variable;
-      const db_id: string = runValue.db_id;
-      const codeValue: string = runValue.sql_script;
-      return {
-        result_variable,
-        value: codeValue,
-        db_id,
-      };
+      try {
+        const runValue = JSON.parse(run);
+        const result_variable: string = runValue.result_variable;
+        const db_id: string = runValue.db_id;
+        const codeValue: string = runValue.sql_script;
+        return {
+          result_variable,
+          value: codeValue,
+          db_id,
+        };
+      } catch (e) {
+        console.warn('🚀 ~ e:', e);
+      }
     }
     return {
       value: '',

package/src/libro-sql-cell-view.tsx

@@ -177,7 +177,20 @@ export const LibroSqlCell = React.forwardRef<HTMLDivElement>(
     };
 
     useEffect(() => {
-      instance.getDatabaseConfig();
+      instance
+        .getDatabaseConfig()
+        .then(() => {
+          if (instance.model.dbId) {
+            setSelectedDb(instance.model.dbId);
+          } else {
+            instance.handleDbChange(instance.databases[0].id);
+            setSelectedDb(instance.databases[0].id);
+          }
+          return;
+        })
+        .catch(() => {
+          //
+        });
     }, [instance]);
 
     const handleChange = (value: string) => {
@@ -352,6 +365,18 @@ export class LibroSqlCellView extends LibroEditableExecutableCellView {
           ) as LibroSqlCellView[],
       );
     }
+    this.parentReady
+      .then(() => {
+        if (this.parent.model.onRestart) {
+          this.parent.model.onRestart(() => {
+            this.getDatabaseConfig();
+          });
+        }
+        return;
+      })
+      .catch(() => {
+        //
+      });
   }
 
   override onViewMount = async () => {