@flumens/models 0.14.0 → 0.16.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/Model.d.ts
CHANGED
|
@@ -20,7 +20,7 @@ export default class Model<T extends Data = Data> {
|
|
|
20
20
|
/**
|
|
21
21
|
* Remote server document ID.
|
|
22
22
|
*/
|
|
23
|
-
id
|
|
23
|
+
id?: string;
|
|
24
24
|
/**
|
|
25
25
|
* Key name of the model used to save and fetch the model from.
|
|
26
26
|
*/
|
|
@@ -77,7 +77,7 @@ export default class Model<T extends Data = Data> {
|
|
|
77
77
|
* Returns a clean (no observables) JSON representation of the model.
|
|
78
78
|
*/
|
|
79
79
|
toJSON(): {
|
|
80
|
-
id: string;
|
|
80
|
+
id: string | undefined;
|
|
81
81
|
cid: string;
|
|
82
82
|
createdAt: number;
|
|
83
83
|
updatedAt: number;
|
package/dist/Model.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var t=require("tslib"),e=require("mobx"),s=require("mobx-utils"),i=require("@flumens/utils");const d=t=>JSON.parse(JSON.stringify(t)),r={};exports.copyObject=d,exports.default=class{constructor({id:t
|
|
1
|
+
"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var t=require("tslib"),e=require("mobx"),s=require("mobx-utils"),i=require("@flumens/utils");const d=t=>JSON.parse(JSON.stringify(t)),r={};exports.copyObject=d,exports.default=class{constructor({id:t,cid:a="",createdAt:o,updatedAt:h,syncedAt:c,data:n={},attrs:u={},store:l}){this.ready=new i.Deferred,this.debouncedValue=3e3,this._observerPaused=!1,this.id=t,this.cid=a||t||i.UUIDv7();const v=Date.now();let y;this.createdAt=o||v,this.updatedAt=h||v,this.syncedAt=c,this.data=d(Object.assign(Object.assign(Object.assign({},r),n),u)),e.makeObservable(this,{createdAt:e.observable,updatedAt:e.observable,syncedAt:e.observable,data:e.observable}),this.store=l;const b=(...t)=>{clearTimeout(y),y=setTimeout((()=>this.sync.apply(this,t)),this.debouncedValue)};s.deepObserve(this.data,(()=>{this._observerPaused||(this.updatedAt=Date.now(),b())}))}setUpdatedAtTimestamp(t){this.updatedAt=t}fetch(){return t.__awaiter(this,void 0,void 0,(function*(){if(!this.store)return void this.ready.resolve(!1);const t=yield this.store.find(this.cid);if(!t)return yield this.save(),void this.ready.resolve(!0);t.id&&(this.id=t.id),t.cid&&(this.cid=t.cid),this._observerPaused=!0,e.set(this.data,t.data),this._observerPaused=!1,this.createdAt=t.createdAt,this.updatedAt=t.updatedAt,this.syncedAt=t.syncedAt,this.ready.resolve(!0)}))}save(){return t.__awaiter(this,void 0,void 0,(function*(){if(!this.store)throw new Error("Trying to save locally without a store");const t=this.toJSON();yield this.store.save(t)}))}destroy(){return t.__awaiter(this,void 0,void 0,(function*(){if(!this.store)throw new Error("Trying to delete locally without a store");yield this.store.delete(this.cid)}))}sync(...e){return t.__awaiter(this,void 0,void 0,(function*(){this.store&&(yield this.save())}))}toJSON(){return{id:this.id,cid:this.cid,createdAt:this.createdAt,updatedAt:this.updatedAt,syncedAt:this.syncedAt,data:e.toJS(this.data)}}reset(t){this.id="";const s=JSON.parse(JSON.stringify(Object.assign(Object.assign({},r),t)));e.set(this.data,s);const i=Object.keys(s);return Object.keys(this.data).forEach((t=>{i.includes(t)||(this.data[t]=null,delete this.data[t])})),this.save()}get isStored(){return!!this.store}};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("tslib"),t=require("jeep-sqlite/loader"),i=require("@capacitor-community/sqlite"),
|
|
1
|
+
"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("tslib"),t=require("jeep-sqlite/loader"),i=require("@capacitor-community/sqlite"),o=require("@capacitor/core"),n=require("@capacitor/filesystem"),s=require("@flumens/utils"),r=require("./utils.js");exports.default=class{static migrateCordova(t){return e.__awaiter(this,void 0,void 0,(function*(){var e;console.log("SQLite: Cordova db migration");const o=new i.SQLiteConnection(i.CapacitorSQLite);try{let i;try{i=yield o.getMigratableDbList(t?"Library/LocalDatabase":void 0)}catch(e){console.log("SQLite: err",e.message)}if(!(null===(e=null==i?void 0:i.values)||void 0===e?void 0:e.length))return void console.log("SQLite: no Cordova db to migrate");console.log("SQLite: migrating",i.values),yield o.addSQLiteSuffix(t?"Library/LocalDatabase":void 0,i.values),yield o.deleteOldDatabases(t?"Library/LocalDatabase":void 0,i.values),console.log("SQLite: migrating done",i.values)}catch(e){console.error(e)}yield o.checkConnectionsConsistency(),yield o.closeAllConnections()}))}get db(){return this.connection}constructor({name:e,debug:t,web:o}){this.sqliteConnection=new i.SQLiteConnection(i.CapacitorSQLite),this.name="main",this.debug=!1,this.isWeb=!1,this.ready=new s.Deferred,this.name=e||this.name,this.debug=t||this.debug,this.isWeb=o||this.isWeb}init(){return e.__awaiter(this,void 0,void 0,(function*(){if(this.isWeb){t.defineCustomElements(window);const e=document.createElement("jeep-sqlite");e.setAttribute("autoSave","true"),document.body.appendChild(e),yield customElements.whenDefined("jeep-sqlite"),yield this.sqliteConnection.initWebStore()}yield this.sqliteConnection.checkConnectionsConsistency(),yield this.sqliteConnection.closeAllConnections(),this.connection=yield this.sqliteConnection.createConnection(this.name,!1,"no-encryption",1,!1),yield this.connection.open(),this.ready.resolve(!0)}))}query(t){return e.__awaiter(this,arguments,void 0,(function*({sql:e,params:t}){var i;yield this.ready;const o=yield this.db.query(e,t).then((e=>e.values||[])).catch((i=>{throw console.error("SQLite query error:",i,{sql:e,params:t}),i}));return this.debug&&(console.groupCollapsed(`💾 SQL: ${e.trimStart().replaceAll(/\n/g," ").replaceAll(/\s+/g," ").substring(0,30)}...`),console.debug(r.formatSqlQuery(e,t||[])),console.groupEnd(),yield null===(i=this.sqliteConnection)||void 0===i?void 0:i.saveToStore(this.name)),o}))}export(){return e.__awaiter(this,void 0,void 0,(function*(){if(this.isWeb){const{name:e}=this;return new Promise((t=>{indexedDB.open("jeepSqliteStore").onsuccess=function(i){i.target.result.transaction(["databases"],"readwrite").objectStore("databases").get(`${e}SQLite.db`).onsuccess=function(e){const i=new Blob([e.target.result],{type:"application/vnd.sqlite3"});t(i)}}}))}const{url:e}=yield this.db.getUrl();return(yield fetch(o.Capacitor.convertFileSrc(e))).blob()}))}import(t){return e.__awaiter(this,void 0,void 0,(function*(){if(this.isWeb){const e=new Uint8Array(yield t.arrayBuffer()),{name:i}=this;return void new Promise((t=>{indexedDB.open("jeepSqliteStore").onsuccess=function(o){o.target.result.transaction(["databases"],"readwrite").objectStore("databases").put(e,`${i}SQLite.db`,0).onsuccess=()=>t()}}))}const{url:e}=yield this.db.getUrl(),i=yield new Promise((e=>{const i=new FileReader;i.onload=e,i.readAsDataURL(t)})).then((e=>e.target.result));yield n.Filesystem.writeFile({path:e,data:i})}))}};
|
|
@@ -36,6 +36,7 @@ type SQLiteStoreOptions<TColumns = ReturnType<typeof defaultCols>> = {
|
|
|
36
36
|
name: string;
|
|
37
37
|
debug?: boolean;
|
|
38
38
|
columns?: TColumns;
|
|
39
|
+
index?: any;
|
|
39
40
|
};
|
|
40
41
|
export default class SQLiteStore<TColumns extends Record<string, ColumnBuilderBase<ColumnBuilderBaseConfig<ColumnDataType, string>, object>> = ReturnType<typeof defaultCols>, T = ColumnMap<TColumns>> implements Store {
|
|
41
42
|
readonly name: string;
|
|
@@ -48,7 +49,7 @@ export default class SQLiteStore<TColumns extends Record<string, ColumnBuilderBa
|
|
|
48
49
|
}>;
|
|
49
50
|
readonly ready: Deferred<boolean>;
|
|
50
51
|
private readonly debug;
|
|
51
|
-
constructor({ db, name, debug, columns, }: SQLiteStoreOptions<TColumns>);
|
|
52
|
+
constructor({ db, name, debug, columns, index, }: SQLiteStoreOptions<TColumns>);
|
|
52
53
|
private init;
|
|
53
54
|
save(values: T | T[]): Promise<void>;
|
|
54
55
|
find(q: string | Partial<T> | SelectQueryFn): Promise<T>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("tslib"),t=require("drizzle-orm"),i=require("drizzle-orm/casing"),r=require("drizzle-orm/sqlite-core"),
|
|
1
|
+
"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("tslib"),t=require("drizzle-orm"),i=require("drizzle-orm/casing"),r=require("drizzle-orm/sqlite-core"),n=require("@flumens/utils"),d=require("./utils.js");function a(e,i){const r=t.getTableColumns(e);return Object.entries(r).filter((([e])=>!i.includes(e))).reduce(((e,[i,r])=>Object.assign(Object.assign({},e),{[i]:t.sql.raw(`excluded.${r.name}`)})),{})}const s=e=>r.customType({dataType:()=>"jsonb",toDriver:e=>JSON.stringify(e)})(e),l=new r.SQLiteSyncDialect,o=()=>({id:r.text().unique(),cid:r.text().primaryKey().notNull().default("id"),data:s("data").notNull(),createdAt:r.integer("created_at").notNull(),updatedAt:r.integer("updated_at").notNull(),syncedAt:r.integer("synced_at")});exports.conflictUpdateAllExcept=a,exports.default=class{constructor({db:e,name:t,debug:i,columns:d=o(),index:a}){this.ready=new n.Deferred,this.db=e,this.name=t,this.debug=i||!1,this.table=r.sqliteTable(this.name,d,a),this.init()}init(){return e.__awaiter(this,void 0,void 0,(function*(){yield this.db.ready;const e=r.getTableConfig(this.table),t=e.columns.map((e=>`${e.name} ${e.getSQLType()}${e.primary?" primary key":""}${e.isUnique?" unique":""}${e.notNull?" not null":""}${e.default?` default ${e.default}`:""}`)).join(",\n");let i="";if(e.foreignKeys.length>0&&(i=", ",i+=e.foreignKeys.map((e=>{const t=e.reference(),i=r.getTableConfig(t.foreignTable),n=e.onDelete?` ON DELETE ${e.onDelete}`:"";return`FOREIGN KEY (${t.columns[0].name}) REFERENCES ${i.name}(${t.foreignColumns[0].name}) ${n}`})).join(", ")),yield this.db.query({sql:`CREATE TABLE IF NOT EXISTS ${this.name} (${t} ${i});`}),e.indexes.length){const t=e.indexes.map((e=>{const t=e.config.unique?"UNIQUE":"",i=e.config.columns.map((({name:e})=>e)).join(", "),r=e.config.name||`${this.name}_${i.replace(/, /g,"_")}_idx`;return this.db.query({sql:`CREATE ${t} INDEX IF NOT EXISTS ${r} ON ${this.name} (${i});`})}));yield Promise.all(t)}this.ready.resolve(!0)}))}save(t){return e.__awaiter(this,void 0,void 0,(function*(){yield this.ready;if(!(Array.isArray(t)?t.length:t))return;if(this.debug&&t.cid){const e=yield this.find({cid:t.cid});d.printDiff(e,t,t.cid,this.name)}let e=new r.SQLiteInsertBuilder(this.table,{},l).values(t);const i=this._getPrimaryCol();i&&(e=e.onConflictDoUpdate({target:i,set:a(this.table,[])})),yield this.db.query(e.toSQL())}))}find(i){return e.__awaiter(this,void 0,void 0,(function*(){yield this.ready;const[e]=yield this.findAll((e=>{if("function"==typeof i)return i(e).limit(1);if("string"==typeof i){const r=this._getPrimaryCol();if(!r)throw new Error("Primary col is missing");return e.where(t.eq(r,i)).limit(1)}const r=Object.entries(i).map((([e,i])=>t.eq(this.table[e],i)));return e.where(t.and(...r)).limit(1)}));return e}))}findAll(n){return e.__awaiter(this,void 0,void 0,(function*(){yield this.ready;let e=(new r.QueryBuilder).select().from(this.table);n&&(e=n(e));return(yield this.db.query(e.toSQL())).map((e=>Object.entries(e).reduce(((e,[r,n])=>{var d;const a="jsonb"===(null===(d=t.getTableColumns(this.table)[r])||void 0===d?void 0:d.sqlName);return e[i.toCamelCase(r)]=a?JSON.parse(n):n,e}),{})))}))}delete(i){return e.__awaiter(this,void 0,void 0,(function*(){yield this.ready;yield this.deleteAll((e=>{if("function"==typeof i)return i(e);if("string"==typeof i){const r=this._getPrimaryCol();if(!r)throw new Error("Primary col is missing");return e.where(t.eq(r,i))}const r=Object.entries(i).map((([e,i])=>t.eq(this.table[e],i)));return e.where(t.and(...r))}))}))}deleteAll(t){return e.__awaiter(this,void 0,void 0,(function*(){yield this.ready;let e=new r.SQLiteDeleteBase(this.table,{},l);t&&(e=t(e)),yield this.db.query(e.toSQL())}))}export(){return e.__awaiter(this,void 0,void 0,(function*(){yield this.ready;return(yield this.findAll()).reduce(((e,t)=>Object.assign(Object.assign({},e),{[t.cid]:t})),{})}))}import(t){return e.__awaiter(this,void 0,void 0,(function*(){if(yield this.ready,yield this.deleteAll(),"object"!=typeof t)throw new Error("Invalid obj passed to store");const i=Object.entries(t).map((([,t])=>this.save((t=>{var i,r,n,d,a,s;if(!t.createdAt&&(null===(i=t.metadata)||void 0===i?void 0:i.createdOn)&&(t.createdAt=null===(r=t.metadata)||void 0===r?void 0:r.createdOn),!t.updatedAt&&(null===(n=t.metadata)||void 0===n?void 0:n.updatedOn)&&(t.updatedAt=null===(d=t.metadata)||void 0===d?void 0:d.updatedOn),!t.syncedAt&&(null===(a=t.metadata)||void 0===a?void 0:a.syncedOn)&&(t.syncedAt=null===(s=t.metadata)||void 0===s?void 0:s.syncedOn),t.samples){const{id:i,cid:r,createdAt:n,updatedAt:d,syncedAt:a}=t,s=e.__rest(t,["id","cid","createdAt","updatedAt","syncedAt"]);t={id:i,cid:r,createdAt:n,updatedAt:d,syncedAt:a,data:Object.assign({},s)}}return t})(t))));Promise.all(i)}))}_getPrimaryCol(){return Object.values(t.getTableColumns(this.table)).find((({primary:e})=>!!e))}},exports.defaultCols=o,exports.jsonb=s;
|
package/dist/Stores/utils.d.ts
CHANGED
package/dist/Stores/utils.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("deep-diff"),
|
|
1
|
+
"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("deep-diff"),r=require("lodash");exports.formatSqlQuery=(e,r)=>{const o=e=>null==e?"NULL":"number"==typeof e||"bigint"==typeof e?`${e}`:"boolean"==typeof e?e?"TRUE":"FALSE":e instanceof Date?`'${e.toISOString()}'`:Array.isArray(e)?e.length?`(${e.map(o).join(", ")})`:"(NULL)":"object"==typeof e?`'${JSON.stringify(e).replace(/'/g,"''")}'`:`'${String(e).replace(/'/g,"''")}'`;let t=0;return e.replace(/\?/g,(()=>{if(t>=r.length)return"?";const e=o(r[t]);return t+=1,e}))},exports.printDiff=function(o,t,n,l=""){const i=e.diff(o,t);if(!i)return;let s={},f=0,p="";if(i.forEach((e=>{const o={[l]:{[n]:{}}};if(!e.path)return o[l][n]=e.rhs,console.groupCollapsed(`Δ + ${n}`),console.log(o),void console.groupEnd();e.path.reduce(((r,o,t)=>{if(e.path.length-1>t)return r[o]={},r[o];const n=JSON.stringify(e.lhs,null,2),l=JSON.stringify(e.rhs,null,2);if(n===l)return r[o];f++,r[o]=`${n} -> ${l}`,p=`${o}: ${n} -> ${l}`}),o[l][n]),s=r.merge(s,o)})),f){let e=`Δ ${n}`;1===f&&(e+=` ${p}`),console.groupCollapsed(e),console.log(s),console.groupEnd()}};
|