Skip to content

Commit 371e820

Browse files
committed
Fix local TS importing strategy
1 parent 465425a commit 371e820

4 files changed

Lines changed: 19 additions & 17 deletions

File tree

package.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
"electron": "^8.2.3",
4444
"fs-extra": "^9.0.0",
4545
"jquery": "^3.5.0",
46+
"karma": "^5.0.2",
4647
"karma-chai": "^0.1.0",
4748
"karma-electron-launcher": "^0.2.0",
4849
"karma-jasmine": "^3.1.1",
@@ -51,13 +52,12 @@
5152
"karma-sauce-launcher": "^4.1.3",
5253
"karma-sinon": "^1.0.5",
5354
"karma-typescript-preprocessor": "^0.4.0",
54-
"karma": "^5.0.2",
5555
"lerna": "^3.20.2",
5656
"mocha": "^7.1",
57+
"rollup": "^2.6",
5758
"rollup-plugin-license": "^2.0.0",
5859
"rollup-plugin-terser": "^5.3.0",
5960
"rollup-plugin-visualizer": "^4.0.4",
60-
"rollup": "^2.6",
6161
"sinon": "^9.0",
6262
"standard": "^14.3.3",
6363
"tslib": "^1.11.1",
@@ -67,6 +67,5 @@
6767
"packages/*"
6868
],
6969
"private": true,
70-
"dependencies": {
71-
}
70+
"dependencies": {}
7271
}

packages/@types/index.d.ts

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -316,13 +316,10 @@ interface KnockoutExtendedArrayObservable<T> extends KnockoutObservable<T[]> {
316316
) : KnockoutComputedArray<U>
317317
}
318318

319-
/**
320-
* These will be added with
321-
interface KnockoutObservableArray<T> extends KnockoutExtendedArrayObservable<T> {
322-
}
319+
interface KnockoutObservableArray<T> extends KnockoutExtendedArrayObservable<T> {
320+
}
323321

324322
interface KnockoutComputedArray<T> extends KnockoutComputed<T>, KnockoutExtendedArrayObservable<T> {}
325-
*/
326323

327324
interface KnockoutLifeCycle {
328325
computed<T>(p: string | (() => T)): KnockoutComputed<T>

packages/utils.jsx/src/JsxObserver.ts

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -61,13 +61,14 @@ function isIterableNonString (v: JsxNodeable) {
6161
* `parentNode` at `insertBefore` with the result.
6262
*/
6363
export class JsxObserver extends LifeCycle {
64-
insertBefore: Node
6564
adoptedInsertBefore: boolean
65+
insertBefore: Node
66+
nodeArrayOrObservableAtIndex: Array<Node|(() => Node)> // | KnockoutObservable
6667
noInitialBinding: boolean
68+
parentNode: Node
6769
parentNodeTarget: Node
70+
subscriptionsForNode: Map<Node, Disposable[]>
6871
xmlns: string
69-
subscriptionsForNode: Map<Node, Disposable>
70-
nodeArrayOrObservableAtIndex: Array<Node|(() => Node)> // | KnockoutObservable
7172

7273
/**
7374
* @param {any} jsxOrObservable take a long list of permutations
@@ -92,7 +93,7 @@ export class JsxObserver extends LifeCycle {
9293
if (!insertBefore) {
9394
const insertAt = parentNodeIsComment ? parentNode.nextSibling : null
9495
insertBefore = this.createComment('O')
95-
parentNodeTarget.insertBefore(insertBefore, insertAt)
96+
parentNodeTarget!.insertBefore(insertBefore, insertAt)
9697
} else {
9798
this.adoptedInsertBefore = true
9899
}
@@ -175,7 +176,7 @@ export class JsxObserver extends LifeCycle {
175176
* - to the new array indexes for adds
176177
* - sorted by index in ascending order
177178
*/
178-
observableArrayChange (changes) {
179+
observableArrayChange (changes: KnockoutArrayChange<any>[]) {
179180
let adds = []
180181
let dels = []
181182
for (const index in changes) {
@@ -196,12 +197,12 @@ export class JsxObserver extends LifeCycle {
196197
* @param {int} index
197198
* @param {string|object|Array|Observable.string|Observable.Array|Obseravble.object} jsx
198199
*/
199-
addChange (index, jsx) {
200+
addChange (index: number, jsx: JsxNodeable) {
200201
this.nodeArrayOrObservableAtIndex.splice(index, 0,
201202
this.injectNode(jsx, this.lastNodeFor(index)))
202203
}
203204

204-
injectNode (jsx, nextNode) {
205+
injectNode (jsx: JsxNodeable, nextNode: Node) {
205206
let nodeArrayOrObservable
206207

207208
if (isObservable(jsx)) {

tsconfig.js renamed to tsconfig.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"compileOnSave": false,
33
"compilerOptions": {
4+
"moduleResolution": "node",
45
"downlevelIteration": true,
56
"target": "ES3",
67
"module": "ES2015",
@@ -11,8 +12,12 @@
1112
"strict": true,
1213
"baseUrl": ".",
1314
"paths": {
14-
"@tko/*": [ "*/src" ],
15+
"@tko/*": ["packages/*/src/index.js"],
1516
"*": ["*"],
1617
},
18+
"traceResolution": true,
1719
},
20+
// "include": ["**/*.ts", "**/*.js", "packages/@types/index.d.ts"],
21+
// "files": ["packages/*/src/index.js"],
22+
// "exclude": ["karma.conf.js", "node_modules", "**/spec/*"],
1823
}

0 commit comments

Comments
 (0)