@neuralinnovations/dataisland-sdk 0.0.1-dev18 → 0.0.1-dev19

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.
Files changed (6) hide show
  1. package/dist/package.json +3 -2
  2. package/dist/src/disposable.d.ts.map +1 -1
  3. package/dist/src/disposable.js +12 -5
  4. package/dist/src/disposable.js.map +1 -1
  5. package/package.json +3 -2
  6. package/src/disposable.ts +18 -5
package/dist/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@neuralinnovations/dataisland-sdk",
3
- "version": "0.0.1-dev18",
3
+ "version": "0.0.1-dev19",
4
4
  "description": "SDK for DataIsland project",
5
5
  "licenses": [
6
6
  {
@@ -39,7 +39,8 @@
39
39
  "lint": "eslint --ext .ts,.tsx src test",
40
40
  "lint:fix": "eslint --fix --ext .ts,.tsx src test",
41
41
  "docs": "typedoc --disableSources --includeVersion --plugin typedoc-plugin-markdown --out docs src/index.ts && node scripts/docs/index.js",
42
- "version-up-dev": "node scripts/version/up-dev.js && rm package-lock.json && npm install"
42
+ "version-up-dev": "node scripts/version/up-dev.js && rm package-lock.json && npm install && npm run build && npm run lint:fix && npm run docs",
43
+ "release": "rm package-lock.json && npm install && npm run build && npm run lint:fix && npm run docs"
43
44
  },
44
45
  "keywords": [
45
46
  "dataisland",
package/dist/src/disposable.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"disposable.d.ts","sourceRoot":"","sources":["../../src/disposable.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,WAAW,UAAU;IACzB,OAAO,IAAI,IAAI,CAAA;CAChB;AAED;;GAEG;AACH,qBAAa,QAAQ;IACP,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAAT,SAAS,EAAE,mBAAmB;IAG3D;;OAEG;IACI,YAAY,IAAI,mBAAmB;IAI1C;;OAEG;IACH,IAAW,UAAU,IAAI,OAAO,CAE/B;IAED;;OAEG;IACI,GAAG,CAAC,UAAU,EAAE,UAAU,GAAG,IAAI;IAKxC;;OAEG;IACI,WAAW,CAAC,QAAQ,EAAE,MAAM,IAAI,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,IAAI;CAIjE;AAED;;;;;;;;GAQG;AACH,qBAAa,mBAAoB,YAAW,UAAU;IACpD,OAAO,CAAC,YAAY,CAAmB;IACvC,OAAO,CAAC,WAAW,CAAQ;IAC3B,OAAO,CAAC,SAAS,CAAC,CAAU;IAE5B;;OAEG;IACH,IAAW,UAAU,IAAI,OAAO,CAE/B;IAED;;OAEG;IACH,IAAW,QAAQ,IAAI,QAAQ,CAE9B;IAED;;;;OAIG;IACI,GAAG,CAAC,UAAU,EAAE,UAAU,GAAG,UAAU;IAM9C;;;;;OAKG;IACI,WAAW,CAAC,QAAQ,EAAE,MAAM,IAAI,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,UAAU;IAStE;;OAEG;IACH,YAAY,IAAI,mBAAmB;IAYnC;;OAEG;IACI,OAAO,IAAI,IAAI;IAYtB;;OAEG;IACH,OAAO,CAAC,gBAAgB;CAKzB;AAED;;;;;GAKG;AACH,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,IAAI,EAAE,MAAM,EAAE,OAAO,GAAG,UAAU,CAI1E"}
1
+ {"version":3,"file":"disposable.d.ts","sourceRoot":"","sources":["../../src/disposable.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,WAAW,UAAU;IACzB,OAAO,IAAI,IAAI,CAAA;CAChB;AAED;;GAEG;AACH,qBAAa,QAAQ;IACP,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAAT,SAAS,EAAE,mBAAmB;IAG3D;;OAEG;IACI,YAAY,IAAI,mBAAmB;IAI1C;;OAEG;IACH,IAAW,UAAU,IAAI,OAAO,CAE/B;IAED;;OAEG;IACI,GAAG,CAAC,UAAU,EAAE,UAAU,GAAG,IAAI;IAKxC;;OAEG;IACI,WAAW,CAAC,QAAQ,EAAE,MAAM,IAAI,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,IAAI;CAIjE;AAED;;;;;;;;GAQG;AACH,qBAAa,mBAAoB,YAAW,UAAU;IACpD,OAAO,CAAC,YAAY,CAAmB;IACvC,OAAO,CAAC,WAAW,CAAQ;IAC3B,OAAO,CAAC,SAAS,CAAC,CAAU;IAE5B;;OAEG;IACH,IAAW,UAAU,IAAI,OAAO,CAE/B;IAED;;OAEG;IACH,IAAW,QAAQ,IAAI,QAAQ,CAE9B;IAED;;;;OAIG;IACI,GAAG,CAAC,UAAU,EAAE,UAAU,GAAG,UAAU;IAO9C;;;;;OAKG;IACI,WAAW,CAAC,QAAQ,EAAE,MAAM,IAAI,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,UAAU;IAUtE;;OAEG;IACH,YAAY,IAAI,mBAAmB;IAcnC;;OAEG;IACI,OAAO,IAAI,IAAI;IAqBtB;;OAEG;IACH,OAAO,CAAC,gBAAgB;CAKzB;AAED;;;;;GAKG;AACH,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,IAAI,EAAE,MAAM,EAAE,OAAO,GAAG,UAAU,CAI1E"}
package/dist/src/disposable.js CHANGED
@@ -69,7 +69,7 @@ class DisposableContainer {
69
69
  * @returns The disposable container.
70
70
  */
71
71
  add(disposable) {
72
- this._throwIfDisposed();
72
+ this._throwIfDisposed("Cannot add disposable to disposed container.");
73
73
  this._disposables.push(disposable);
74
74
  return disposable;
75
75
  }
@@ -80,7 +80,7 @@ class DisposableContainer {
80
80
  * @returns The disposable container.
81
81
  */
82
82
  addCallback(callback, target) {
83
- this._throwIfDisposed();
83
+ this._throwIfDisposed("Cannot add callback to disposed container.");
84
84
  return this.add({
85
85
  dispose() {
86
86
  callback.call(target);
@@ -91,6 +91,7 @@ class DisposableContainer {
91
91
  * Defines a nested disposable container.
92
92
  */
93
93
  defineNested() {
94
+ this._throwIfDisposed("Cannot define nested disposable for disposed container.");
94
95
  const nested = new DisposableContainer();
95
96
  this._disposables.push(nested);
96
97
  nested.addCallback(() => {
@@ -105,22 +106,28 @@ class DisposableContainer {
105
106
  * Disposes all disposables in this container. Last added, first disposed.
106
107
  */
107
108
  dispose() {
108
- this._throwIfDisposed();
109
+ // return if already disposed
110
+ if (this._isDisposed) {
111
+ return;
112
+ }
113
+ // mark as disposed
109
114
  this._isDisposed = true;
115
+ // dispose all disposables
110
116
  this._disposables
111
117
  .slice()
112
118
  .reverse()
113
119
  .forEach(it => {
114
120
  it.dispose();
115
121
  });
122
+ // clear disposables
116
123
  this._disposables = [];
117
124
  }
118
125
  /**
119
126
  * Throws an error if this container is disposed.
120
127
  */
121
- _throwIfDisposed() {
128
+ _throwIfDisposed(message) {
122
129
  if (this._isDisposed) {
123
- throw new Error("Object disposed");
130
+ throw new Error("Object disposed, but you try to use it: " + message);
124
131
  }
125
132
  }
126
133
  }
package/dist/src/disposable.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"disposable.js","sourceRoot":"","sources":["../../src/disposable.ts"],"names":[],"mappings":";;;AAOA;;GAEG;AACH,MAAa,QAAQ;IACnB,YAA6B,SAA8B;QAA9B,cAAS,GAAT,SAAS,CAAqB;IAC3D,CAAC;IAED;;OAEG;IACI,YAAY;QACjB,OAAO,IAAI,CAAC,SAAS,CAAC,YAAY,EAAE,CAAA;IACtC,CAAC;IAED;;OAEG;IACH,IAAW,UAAU;QACnB,OAAO,IAAI,CAAC,SAAS,CAAC,UAAU,CAAA;IAClC,CAAC;IAED;;OAEG;IACI,GAAG,CAAC,UAAsB;QAC/B,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;QAC9B,OAAO,IAAI,CAAA;IACb,CAAC;IAED;;OAEG;IACI,WAAW,CAAC,QAAoB,EAAE,MAAgB;QACvD,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAA;QAC5C,OAAO,IAAI,CAAA;IACb,CAAC;CACF;AAjCD,4BAiCC;AAED;;;;;;;;GAQG;AACH,MAAa,mBAAmB;IAAhC;QACU,iBAAY,GAAiB,EAAE,CAAA;QAC/B,gBAAW,GAAG,KAAK,CAAA;IAiF7B,CAAC;IA9EC;;OAEG;IACH,IAAW,UAAU;QACnB,OAAO,IAAI,CAAC,WAAW,CAAA;IACzB,CAAC;IAED;;OAEG;IACH,IAAW,QAAQ;;QACjB,OAAO,MAAA,IAAI,CAAC,SAAS,mCAAI,CAAC,IAAI,CAAC,SAAS,GAAG,IAAI,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAA;IAChE,CAAC;IAED;;;;OAIG;IACI,GAAG,CAAC,UAAsB;QAC/B,IAAI,CAAC,gBAAgB,EAAE,CAAA;QACvB,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;QAClC,OAAO,UAAU,CAAA;IACnB,CAAC;IAED;;;;;OAKG;IACI,WAAW,CAAC,QAAoB,EAAE,MAAgB;QACvD,IAAI,CAAC,gBAAgB,EAAE,CAAA;QACvB,OAAO,IAAI,CAAC,GAAG,CAAC;YACd,OAAO;gBACL,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;YACvB,CAAC;SACF,CAAC,CAAA;IACJ,CAAC;IAED;;OAEG;IACH,YAAY;QACV,MAAM,MAAM,GAAG,IAAI,mBAAmB,EAAE,CAAA;QACxC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QAC9B,MAAM,CAAC,WAAW,CAAC,GAAG,EAAE;YACtB,MAAM,KAAK,GAAG,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;YAC/C,IAAI,KAAK,GAAG,CAAC,CAAC,EAAE,CAAC;gBACf,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAA;YACpC,CAAC;QACH,CAAC,EAAE,IAAI,CAAC,CAAA;QACR,OAAO,MAAM,CAAA;IACf,CAAC;IAED;;OAEG;IACI,OAAO;QACZ,IAAI,CAAC,gBAAgB,EAAE,CAAA;QACvB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAA;QACvB,IAAI,CAAC,YAAY;aACd,KAAK,EAAE;aACP,OAAO,EAAE;aACT,OAAO,CAAC,EAAE,CAAC,EAAE;YACZ,EAAE,CAAC,OAAO,EAAE,CAAA;QACd,CAAC,CAAC,CAAA;QACJ,IAAI,CAAC,YAAY,GAAG,EAAE,CAAA;IACxB,CAAC;IAED;;OAEG;IACK,gBAAgB;QACtB,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;YACrB,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAA;QACpC,CAAC;IACH,CAAC;CACF;AAnFD,kDAmFC;AAED;;;;;GAKG;AACH,SAAgB,UAAU,CAAC,MAAkB,EAAE,MAAe;IAC5D,OAAO,IAAI,mBAAmB,EAAE,CAAC,WAAW,CAAC,GAAG,EAAE;QAChD,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;IACrB,CAAC,CAAC,CAAA;AACJ,CAAC;AAJD,gCAIC"}
1
+ {"version":3,"file":"disposable.js","sourceRoot":"","sources":["../../src/disposable.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@neuralinnovations/dataisland-sdk",
3
- "version": "0.0.1-dev18",
3
+ "version": "0.0.1-dev19",
4
4
  "description": "SDK for DataIsland project",
5
5
  "licenses": [
6
6
  {
@@ -39,7 +39,8 @@
39
39
  "lint": "eslint --ext .ts,.tsx src test",
40
40
  "lint:fix": "eslint --fix --ext .ts,.tsx src test",
41
41
  "docs": "typedoc --disableSources --includeVersion --plugin typedoc-plugin-markdown --out docs src/index.ts && node scripts/docs/index.js",
42
- "version-up-dev": "node scripts/version/up-dev.js && rm package-lock.json && npm install"
42
+ "version-up-dev": "node scripts/version/up-dev.js && rm package-lock.json && npm install && npm run build && npm run lint:fix && npm run docs",
43
+ "release": "rm package-lock.json && npm install && npm run build && npm run lint:fix && npm run docs"
43
44
  },
44
45
  "keywords": [
45
46
  "dataisland",
package/src/disposable.ts CHANGED
@@ -77,7 +77,8 @@ export class DisposableContainer implements Disposable {
77
77
  * @returns The disposable container.
78
78
  */
79
79
  public add(disposable: Disposable): Disposable {
80
- this._throwIfDisposed()
80
+ this._throwIfDisposed("Cannot add disposable to disposed container.")
81
+
81
82
  this._disposables.push(disposable)
82
83
  return disposable
83
84
  }
@@ -89,7 +90,8 @@ export class DisposableContainer implements Disposable {
89
90
  * @returns The disposable container.
90
91
  */
91
92
  public addCallback(callback: () => void, target?: unknown): Disposable {
92
- this._throwIfDisposed()
93
+ this._throwIfDisposed("Cannot add callback to disposed container.")
94
+
93
95
  return this.add({
94
96
  dispose() {
95
97
  callback.call(target)
@@ -101,6 +103,8 @@ export class DisposableContainer implements Disposable {
101
103
  * Defines a nested disposable container.
102
104
  */
103
105
  defineNested(): DisposableContainer {
106
+ this._throwIfDisposed("Cannot define nested disposable for disposed container.")
107
+
104
108
  const nested = new DisposableContainer()
105
109
  this._disposables.push(nested)
106
110
  nested.addCallback(() => {
@@ -116,23 +120,32 @@ export class DisposableContainer implements Disposable {
116
120
  * Disposes all disposables in this container. Last added, first disposed.
117
121
  */
118
122
  public dispose(): void {
119
- this._throwIfDisposed()
123
+ // return if already disposed
124
+ if (this._isDisposed) {
125
+ return
126
+ }
127
+
128
+ // mark as disposed
120
129
  this._isDisposed = true
130
+
131
+ // dispose all disposables
121
132
  this._disposables
122
133
  .slice()
123
134
  .reverse()
124
135
  .forEach(it => {
125
136
  it.dispose()
126
137
  })
138
+
139
+ // clear disposables
127
140
  this._disposables = []
128
141
  }
129
142
 
130
143
  /**
131
144
  * Throws an error if this container is disposed.
132
145
  */
133
- private _throwIfDisposed(): void {
146
+ private _throwIfDisposed(message: string): void {
134
147
  if (this._isDisposed) {
135
- throw new Error("Object disposed")
148
+ throw new Error("Object disposed, but you try to use it: " + message)
136
149
  }
137
150
  }
138
151
  }