@loaders.gl/loader-utils 3.3.0-alpha.1 → 3.3.0-alpha.11
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/es5/index.js +97 -119
- package/dist/es5/index.js.map +1 -1
- package/dist/es5/json-loader.js +2 -9
- package/dist/es5/json-loader.js.map +1 -1
- package/dist/es5/lib/binary-utils/array-buffer-utils.js +6 -26
- package/dist/es5/lib/binary-utils/array-buffer-utils.js.map +1 -1
- package/dist/es5/lib/binary-utils/binary-copy-utils.js +0 -4
- package/dist/es5/lib/binary-utils/binary-copy-utils.js.map +1 -1
- package/dist/es5/lib/binary-utils/buffer-utils.js +1 -9
- package/dist/es5/lib/binary-utils/buffer-utils.js.map +1 -1
- package/dist/es5/lib/binary-utils/encode-utils.js +2 -8
- package/dist/es5/lib/binary-utils/encode-utils.js.map +1 -1
- package/dist/es5/lib/binary-utils/get-first-characters.js +0 -7
- package/dist/es5/lib/binary-utils/get-first-characters.js.map +1 -1
- package/dist/es5/lib/binary-utils/memory-copy-utils.js +1 -4
- package/dist/es5/lib/binary-utils/memory-copy-utils.js.map +1 -1
- package/dist/es5/lib/env-utils/assert.js +0 -1
- package/dist/es5/lib/env-utils/assert.js.map +1 -1
- package/dist/es5/lib/env-utils/globals.js +5 -4
- package/dist/es5/lib/env-utils/globals.js.map +1 -1
- package/dist/es5/lib/filesystems/node-filesystem.js +2 -45
- package/dist/es5/lib/filesystems/node-filesystem.js.map +1 -1
- package/dist/es5/lib/iterators/async-iteration.js +57 -127
- package/dist/es5/lib/iterators/async-iteration.js.map +1 -1
- package/dist/es5/lib/iterators/text-iterators.js +127 -242
- package/dist/es5/lib/iterators/text-iterators.js.map +1 -1
- package/dist/es5/lib/node/buffer.js +0 -6
- package/dist/es5/lib/node/buffer.js.map +1 -1
- package/dist/es5/lib/node/fs.js +17 -24
- package/dist/es5/lib/node/fs.js.map +1 -1
- package/dist/es5/lib/node/util.js +20 -11
- package/dist/es5/lib/node/util.js.map +1 -1
- package/dist/es5/lib/parser-utils/parse-json.js +0 -2
- package/dist/es5/lib/parser-utils/parse-json.js.map +1 -1
- package/dist/es5/lib/path-utils/file-aliases.js +3 -4
- package/dist/es5/lib/path-utils/file-aliases.js.map +1 -1
- package/dist/es5/lib/path-utils/path.js +1 -4
- package/dist/es5/lib/path-utils/path.js.map +1 -1
- package/dist/es5/lib/request-utils/request-scheduler.js +24 -33
- package/dist/es5/lib/request-utils/request-scheduler.js.map +1 -1
- package/dist/es5/lib/worker-loader-utils/create-loader-worker.js +2 -36
- package/dist/es5/lib/worker-loader-utils/create-loader-worker.js.map +1 -1
- package/dist/es5/lib/worker-loader-utils/encode-with-worker.js +0 -4
- package/dist/es5/lib/worker-loader-utils/encode-with-worker.js.map +1 -1
- package/dist/es5/lib/worker-loader-utils/parse-with-worker.js +2 -23
- package/dist/es5/lib/worker-loader-utils/parse-with-worker.js.map +1 -1
- package/dist/es5/types.js.map +1 -1
- package/dist/es5/workers/json-worker.js +0 -2
- package/dist/es5/workers/json-worker.js.map +1 -1
- package/dist/esm/index.js +15 -3
- package/dist/esm/index.js.map +1 -1
- package/dist/esm/json-loader.js +3 -2
- package/dist/esm/json-loader.js.map +1 -1
- package/dist/esm/lib/binary-utils/array-buffer-utils.js +16 -15
- package/dist/esm/lib/binary-utils/array-buffer-utils.js.map +1 -1
- package/dist/esm/lib/binary-utils/binary-copy-utils.js +2 -2
- package/dist/esm/lib/binary-utils/binary-copy-utils.js.map +1 -1
- package/dist/esm/lib/binary-utils/buffer-utils.js +3 -1
- package/dist/esm/lib/binary-utils/buffer-utils.js.map +1 -1
- package/dist/esm/lib/binary-utils/encode-utils.js +2 -4
- package/dist/esm/lib/binary-utils/encode-utils.js.map +1 -1
- package/dist/esm/lib/binary-utils/get-first-characters.js +2 -5
- package/dist/esm/lib/binary-utils/get-first-characters.js.map +1 -1
- package/dist/esm/lib/binary-utils/memory-copy-utils.js +5 -2
- package/dist/esm/lib/binary-utils/memory-copy-utils.js.map +1 -1
- package/dist/esm/lib/env-utils/assert.js +1 -0
- package/dist/esm/lib/env-utils/assert.js.map +1 -1
- package/dist/esm/lib/env-utils/globals.js +7 -1
- package/dist/esm/lib/env-utils/globals.js.map +1 -1
- package/dist/esm/lib/filesystems/node-filesystem.js +10 -16
- package/dist/esm/lib/filesystems/node-filesystem.js.map +1 -1
- package/dist/esm/lib/iterators/async-iteration.js +2 -7
- package/dist/esm/lib/iterators/async-iteration.js.map +1 -1
- package/dist/esm/lib/iterators/text-iterators.js +7 -7
- package/dist/esm/lib/iterators/text-iterators.js.map +1 -1
- package/dist/esm/lib/node/buffer.js +4 -5
- package/dist/esm/lib/node/buffer.js.map +1 -1
- package/dist/esm/lib/node/fs.js +16 -13
- package/dist/esm/lib/node/fs.js.map +1 -1
- package/dist/esm/lib/node/util.js +16 -2
- package/dist/esm/lib/node/util.js.map +1 -1
- package/dist/esm/lib/parser-utils/parse-json.js +1 -0
- package/dist/esm/lib/parser-utils/parse-json.js.map +1 -1
- package/dist/esm/lib/path-utils/file-aliases.js +6 -2
- package/dist/esm/lib/path-utils/file-aliases.js.map +1 -1
- package/dist/esm/lib/path-utils/path.js +8 -3
- package/dist/esm/lib/path-utils/path.js.map +1 -1
- package/dist/esm/lib/request-utils/request-scheduler.js +11 -21
- package/dist/esm/lib/request-utils/request-scheduler.js.map +1 -1
- package/dist/esm/lib/worker-loader-utils/create-loader-worker.js +19 -17
- package/dist/esm/lib/worker-loader-utils/create-loader-worker.js.map +1 -1
- package/dist/esm/lib/worker-loader-utils/encode-with-worker.js +1 -1
- package/dist/esm/lib/worker-loader-utils/encode-with-worker.js.map +1 -1
- package/dist/esm/lib/worker-loader-utils/parse-with-worker.js +6 -7
- package/dist/esm/lib/worker-loader-utils/parse-with-worker.js.map +1 -1
- package/dist/esm/types.js.map +1 -1
- package/dist/esm/workers/json-worker.js.map +1 -1
- package/dist/index.d.ts +1 -3
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +10 -8
- package/dist/lib/binary-utils/buffer-utils.js +5 -1
- package/dist/lib/env-utils/globals.d.ts +1 -1
- package/dist/lib/env-utils/globals.d.ts.map +1 -1
- package/dist/lib/filesystems/node-filesystem.d.ts +3 -2
- package/dist/lib/filesystems/node-filesystem.d.ts.map +1 -1
- package/dist/lib/filesystems/node-filesystem.js +5 -1
- package/dist/lib/node/fs.js +8 -8
- package/dist/lib/node/util.d.ts +10 -3
- package/dist/lib/node/util.d.ts.map +1 -1
- package/dist/lib/node/util.js +24 -23
- package/dist/lib/request-utils/request-scheduler.d.ts +6 -6
- package/dist/lib/request-utils/request-scheduler.d.ts.map +1 -1
- package/dist/lib/worker-loader-utils/create-loader-worker.js +1 -1
- package/dist/types.d.ts +29 -29
- package/dist/types.d.ts.map +1 -1
- package/package.json +3 -3
- package/src/index.ts +3 -6
- package/src/lib/node/fs.ts +9 -9
- package/src/lib/node/util.ts +28 -2
package/dist/es5/index.js
CHANGED
|
@@ -1,184 +1,189 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
3
|
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
|
-
|
|
5
4
|
var _typeof = require("@babel/runtime/helpers/typeof");
|
|
6
|
-
|
|
7
5
|
Object.defineProperty(exports, "__esModule", {
|
|
8
6
|
value: true
|
|
9
7
|
});
|
|
10
|
-
Object.defineProperty(exports, "
|
|
8
|
+
Object.defineProperty(exports, "JSONLoader", {
|
|
11
9
|
enumerable: true,
|
|
12
10
|
get: function get() {
|
|
13
|
-
return
|
|
11
|
+
return _jsonLoader.JSONLoader;
|
|
14
12
|
}
|
|
15
13
|
});
|
|
16
|
-
Object.defineProperty(exports, "
|
|
14
|
+
Object.defineProperty(exports, "RequestScheduler", {
|
|
17
15
|
enumerable: true,
|
|
18
16
|
get: function get() {
|
|
19
|
-
return
|
|
17
|
+
return _requestScheduler.default;
|
|
20
18
|
}
|
|
21
19
|
});
|
|
22
|
-
Object.defineProperty(exports, "
|
|
20
|
+
Object.defineProperty(exports, "_NodeFileSystem", {
|
|
23
21
|
enumerable: true,
|
|
24
22
|
get: function get() {
|
|
25
|
-
return
|
|
23
|
+
return _nodeFilesystem.default;
|
|
26
24
|
}
|
|
27
25
|
});
|
|
28
|
-
Object.defineProperty(exports, "
|
|
26
|
+
Object.defineProperty(exports, "_addAliases", {
|
|
29
27
|
enumerable: true,
|
|
30
28
|
get: function get() {
|
|
31
|
-
return
|
|
29
|
+
return _fileAliases.addAliases;
|
|
32
30
|
}
|
|
33
31
|
});
|
|
34
|
-
Object.defineProperty(exports, "
|
|
32
|
+
Object.defineProperty(exports, "assert", {
|
|
35
33
|
enumerable: true,
|
|
36
34
|
get: function get() {
|
|
37
|
-
return
|
|
35
|
+
return _assert.assert;
|
|
38
36
|
}
|
|
39
37
|
});
|
|
40
|
-
Object.defineProperty(exports, "
|
|
38
|
+
Object.defineProperty(exports, "bufferToArrayBuffer", {
|
|
41
39
|
enumerable: true,
|
|
42
40
|
get: function get() {
|
|
43
|
-
return
|
|
41
|
+
return _bufferUtils.bufferToArrayBuffer;
|
|
44
42
|
}
|
|
45
43
|
});
|
|
46
|
-
Object.defineProperty(exports, "
|
|
44
|
+
Object.defineProperty(exports, "canEncodeWithWorker", {
|
|
47
45
|
enumerable: true,
|
|
48
46
|
get: function get() {
|
|
49
|
-
return
|
|
47
|
+
return _encodeWithWorker.canEncodeWithWorker;
|
|
50
48
|
}
|
|
51
49
|
});
|
|
52
|
-
Object.defineProperty(exports, "
|
|
50
|
+
Object.defineProperty(exports, "canParseWithWorker", {
|
|
53
51
|
enumerable: true,
|
|
54
52
|
get: function get() {
|
|
55
|
-
return
|
|
53
|
+
return _parseWithWorker.canParseWithWorker;
|
|
56
54
|
}
|
|
57
55
|
});
|
|
58
|
-
Object.defineProperty(exports, "
|
|
56
|
+
Object.defineProperty(exports, "compareArrayBuffers", {
|
|
59
57
|
enumerable: true,
|
|
60
58
|
get: function get() {
|
|
61
|
-
return
|
|
59
|
+
return _arrayBufferUtils.compareArrayBuffers;
|
|
62
60
|
}
|
|
63
61
|
});
|
|
64
|
-
Object.defineProperty(exports, "
|
|
62
|
+
Object.defineProperty(exports, "concatenateArrayBuffers", {
|
|
65
63
|
enumerable: true,
|
|
66
64
|
get: function get() {
|
|
67
|
-
return
|
|
65
|
+
return _arrayBufferUtils.concatenateArrayBuffers;
|
|
68
66
|
}
|
|
69
67
|
});
|
|
70
|
-
Object.defineProperty(exports, "
|
|
68
|
+
Object.defineProperty(exports, "concatenateArrayBuffersAsync", {
|
|
71
69
|
enumerable: true,
|
|
72
70
|
get: function get() {
|
|
73
|
-
return
|
|
71
|
+
return _asyncIteration.concatenateArrayBuffersAsync;
|
|
74
72
|
}
|
|
75
73
|
});
|
|
76
|
-
Object.defineProperty(exports, "
|
|
74
|
+
Object.defineProperty(exports, "concatenateTypedArrays", {
|
|
77
75
|
enumerable: true,
|
|
78
76
|
get: function get() {
|
|
79
|
-
return
|
|
77
|
+
return _arrayBufferUtils.concatenateTypedArrays;
|
|
80
78
|
}
|
|
81
79
|
});
|
|
82
|
-
Object.defineProperty(exports, "
|
|
80
|
+
Object.defineProperty(exports, "copyArrayBuffer", {
|
|
83
81
|
enumerable: true,
|
|
84
82
|
get: function get() {
|
|
85
|
-
return
|
|
83
|
+
return _memoryCopyUtils.copyArrayBuffer;
|
|
86
84
|
}
|
|
87
85
|
});
|
|
88
|
-
Object.defineProperty(exports, "
|
|
86
|
+
Object.defineProperty(exports, "copyBinaryToDataView", {
|
|
89
87
|
enumerable: true,
|
|
90
88
|
get: function get() {
|
|
91
|
-
return
|
|
89
|
+
return _encodeUtils.copyBinaryToDataView;
|
|
92
90
|
}
|
|
93
91
|
});
|
|
94
|
-
Object.defineProperty(exports, "
|
|
92
|
+
Object.defineProperty(exports, "copyPaddedArrayBufferToDataView", {
|
|
95
93
|
enumerable: true,
|
|
96
94
|
get: function get() {
|
|
97
|
-
return
|
|
95
|
+
return _binaryCopyUtils.copyPaddedArrayBufferToDataView;
|
|
98
96
|
}
|
|
99
97
|
});
|
|
100
|
-
Object.defineProperty(exports, "
|
|
98
|
+
Object.defineProperty(exports, "copyPaddedStringToDataView", {
|
|
101
99
|
enumerable: true,
|
|
102
100
|
get: function get() {
|
|
103
|
-
return
|
|
101
|
+
return _binaryCopyUtils.copyPaddedStringToDataView;
|
|
104
102
|
}
|
|
105
103
|
});
|
|
106
|
-
Object.defineProperty(exports, "
|
|
104
|
+
Object.defineProperty(exports, "copyStringToDataView", {
|
|
107
105
|
enumerable: true,
|
|
108
106
|
get: function get() {
|
|
109
|
-
return
|
|
107
|
+
return _encodeUtils.copyStringToDataView;
|
|
110
108
|
}
|
|
111
109
|
});
|
|
112
|
-
Object.defineProperty(exports, "
|
|
110
|
+
Object.defineProperty(exports, "copyToArray", {
|
|
113
111
|
enumerable: true,
|
|
114
112
|
get: function get() {
|
|
115
|
-
return
|
|
113
|
+
return _memoryCopyUtils.copyToArray;
|
|
116
114
|
}
|
|
117
115
|
});
|
|
118
|
-
Object.defineProperty(exports, "
|
|
116
|
+
Object.defineProperty(exports, "createLoaderWorker", {
|
|
119
117
|
enumerable: true,
|
|
120
118
|
get: function get() {
|
|
121
|
-
return
|
|
119
|
+
return _createLoaderWorker.createLoaderWorker;
|
|
122
120
|
}
|
|
123
121
|
});
|
|
124
|
-
Object.defineProperty(exports, "
|
|
122
|
+
Object.defineProperty(exports, "document", {
|
|
125
123
|
enumerable: true,
|
|
126
124
|
get: function get() {
|
|
127
|
-
return
|
|
125
|
+
return _globals.document;
|
|
128
126
|
}
|
|
129
127
|
});
|
|
130
|
-
Object.defineProperty(exports, "
|
|
128
|
+
Object.defineProperty(exports, "forEach", {
|
|
131
129
|
enumerable: true,
|
|
132
130
|
get: function get() {
|
|
133
|
-
return
|
|
131
|
+
return _asyncIteration.forEach;
|
|
134
132
|
}
|
|
135
133
|
});
|
|
136
|
-
|
|
134
|
+
exports.fs = void 0;
|
|
135
|
+
Object.defineProperty(exports, "getFirstCharacters", {
|
|
137
136
|
enumerable: true,
|
|
138
137
|
get: function get() {
|
|
139
|
-
return
|
|
138
|
+
return _getFirstCharacters.getFirstCharacters;
|
|
140
139
|
}
|
|
141
140
|
});
|
|
142
|
-
Object.defineProperty(exports, "
|
|
141
|
+
Object.defineProperty(exports, "getMagicString", {
|
|
143
142
|
enumerable: true,
|
|
144
143
|
get: function get() {
|
|
145
|
-
return
|
|
144
|
+
return _getFirstCharacters.getMagicString;
|
|
146
145
|
}
|
|
147
146
|
});
|
|
148
|
-
Object.defineProperty(exports, "
|
|
147
|
+
Object.defineProperty(exports, "getPathPrefix", {
|
|
149
148
|
enumerable: true,
|
|
150
149
|
get: function get() {
|
|
151
|
-
return
|
|
150
|
+
return _fileAliases.getPathPrefix;
|
|
152
151
|
}
|
|
153
152
|
});
|
|
154
|
-
Object.defineProperty(exports, "
|
|
153
|
+
Object.defineProperty(exports, "global", {
|
|
155
154
|
enumerable: true,
|
|
156
155
|
get: function get() {
|
|
157
|
-
return
|
|
156
|
+
return _globals.global;
|
|
158
157
|
}
|
|
159
158
|
});
|
|
160
|
-
Object.defineProperty(exports, "
|
|
159
|
+
Object.defineProperty(exports, "isBrowser", {
|
|
161
160
|
enumerable: true,
|
|
162
161
|
get: function get() {
|
|
163
|
-
return
|
|
162
|
+
return _globals.isBrowser;
|
|
164
163
|
}
|
|
165
164
|
});
|
|
166
|
-
Object.defineProperty(exports, "
|
|
165
|
+
Object.defineProperty(exports, "isBuffer", {
|
|
167
166
|
enumerable: true,
|
|
168
167
|
get: function get() {
|
|
169
|
-
return
|
|
168
|
+
return _bufferUtils.isBuffer;
|
|
170
169
|
}
|
|
171
170
|
});
|
|
172
|
-
Object.defineProperty(exports, "
|
|
171
|
+
Object.defineProperty(exports, "isWorker", {
|
|
173
172
|
enumerable: true,
|
|
174
173
|
get: function get() {
|
|
175
|
-
return
|
|
174
|
+
return _globals.isWorker;
|
|
176
175
|
}
|
|
177
176
|
});
|
|
178
|
-
Object.defineProperty(exports, "
|
|
177
|
+
Object.defineProperty(exports, "makeLineIterator", {
|
|
179
178
|
enumerable: true,
|
|
180
179
|
get: function get() {
|
|
181
|
-
return _textIterators.
|
|
180
|
+
return _textIterators.makeLineIterator;
|
|
181
|
+
}
|
|
182
|
+
});
|
|
183
|
+
Object.defineProperty(exports, "makeNumberedLineIterator", {
|
|
184
|
+
enumerable: true,
|
|
185
|
+
get: function get() {
|
|
186
|
+
return _textIterators.makeNumberedLineIterator;
|
|
182
187
|
}
|
|
183
188
|
});
|
|
184
189
|
Object.defineProperty(exports, "makeTextDecoderIterator", {
|
|
@@ -187,147 +192,120 @@ Object.defineProperty(exports, "makeTextDecoderIterator", {
|
|
|
187
192
|
return _textIterators.makeTextDecoderIterator;
|
|
188
193
|
}
|
|
189
194
|
});
|
|
190
|
-
Object.defineProperty(exports, "
|
|
195
|
+
Object.defineProperty(exports, "makeTextEncoderIterator", {
|
|
191
196
|
enumerable: true,
|
|
192
197
|
get: function get() {
|
|
193
|
-
return _textIterators.
|
|
198
|
+
return _textIterators.makeTextEncoderIterator;
|
|
194
199
|
}
|
|
195
200
|
});
|
|
196
|
-
Object.defineProperty(exports, "
|
|
201
|
+
Object.defineProperty(exports, "nodeVersion", {
|
|
197
202
|
enumerable: true,
|
|
198
203
|
get: function get() {
|
|
199
|
-
return
|
|
204
|
+
return _globals.nodeVersion;
|
|
200
205
|
}
|
|
201
206
|
});
|
|
202
|
-
Object.defineProperty(exports, "
|
|
207
|
+
Object.defineProperty(exports, "padStringToByteAlignment", {
|
|
203
208
|
enumerable: true,
|
|
204
209
|
get: function get() {
|
|
205
|
-
return
|
|
210
|
+
return _encodeUtils.padStringToByteAlignment;
|
|
206
211
|
}
|
|
207
212
|
});
|
|
208
|
-
Object.defineProperty(exports, "
|
|
213
|
+
Object.defineProperty(exports, "padToNBytes", {
|
|
209
214
|
enumerable: true,
|
|
210
215
|
get: function get() {
|
|
211
|
-
return
|
|
216
|
+
return _memoryCopyUtils.padToNBytes;
|
|
212
217
|
}
|
|
213
218
|
});
|
|
214
|
-
Object.defineProperty(exports, "
|
|
219
|
+
Object.defineProperty(exports, "parseJSON", {
|
|
215
220
|
enumerable: true,
|
|
216
221
|
get: function get() {
|
|
217
|
-
return
|
|
222
|
+
return _parseJson.parseJSON;
|
|
218
223
|
}
|
|
219
224
|
});
|
|
220
|
-
Object.defineProperty(exports, "
|
|
225
|
+
Object.defineProperty(exports, "parseWithWorker", {
|
|
221
226
|
enumerable: true,
|
|
222
227
|
get: function get() {
|
|
223
|
-
return
|
|
228
|
+
return _parseWithWorker.parseWithWorker;
|
|
224
229
|
}
|
|
225
230
|
});
|
|
226
|
-
|
|
231
|
+
exports.path = void 0;
|
|
232
|
+
Object.defineProperty(exports, "promisify1", {
|
|
227
233
|
enumerable: true,
|
|
228
234
|
get: function get() {
|
|
229
|
-
return
|
|
235
|
+
return _util.promisify1;
|
|
230
236
|
}
|
|
231
237
|
});
|
|
232
|
-
Object.defineProperty(exports, "
|
|
238
|
+
Object.defineProperty(exports, "promisify2", {
|
|
233
239
|
enumerable: true,
|
|
234
240
|
get: function get() {
|
|
235
|
-
return
|
|
241
|
+
return _util.promisify2;
|
|
236
242
|
}
|
|
237
243
|
});
|
|
238
|
-
Object.defineProperty(exports, "
|
|
244
|
+
Object.defineProperty(exports, "resolvePath", {
|
|
239
245
|
enumerable: true,
|
|
240
246
|
get: function get() {
|
|
241
|
-
return _fileAliases.
|
|
247
|
+
return _fileAliases.resolvePath;
|
|
242
248
|
}
|
|
243
249
|
});
|
|
244
|
-
Object.defineProperty(exports, "
|
|
250
|
+
Object.defineProperty(exports, "self", {
|
|
245
251
|
enumerable: true,
|
|
246
252
|
get: function get() {
|
|
247
|
-
return
|
|
253
|
+
return _globals.self;
|
|
248
254
|
}
|
|
249
255
|
});
|
|
250
|
-
Object.defineProperty(exports, "
|
|
256
|
+
Object.defineProperty(exports, "setPathPrefix", {
|
|
251
257
|
enumerable: true,
|
|
252
258
|
get: function get() {
|
|
253
|
-
return
|
|
259
|
+
return _fileAliases.setPathPrefix;
|
|
254
260
|
}
|
|
255
261
|
});
|
|
256
|
-
Object.defineProperty(exports, "
|
|
262
|
+
Object.defineProperty(exports, "sliceArrayBuffer", {
|
|
257
263
|
enumerable: true,
|
|
258
264
|
get: function get() {
|
|
259
|
-
return
|
|
265
|
+
return _arrayBufferUtils.sliceArrayBuffer;
|
|
260
266
|
}
|
|
261
267
|
});
|
|
262
|
-
Object.defineProperty(exports, "
|
|
268
|
+
Object.defineProperty(exports, "toArrayBuffer", {
|
|
263
269
|
enumerable: true,
|
|
264
270
|
get: function get() {
|
|
265
|
-
return
|
|
271
|
+
return _arrayBufferUtils.toArrayBuffer;
|
|
266
272
|
}
|
|
267
273
|
});
|
|
268
|
-
Object.defineProperty(exports, "
|
|
274
|
+
Object.defineProperty(exports, "toBuffer", {
|
|
269
275
|
enumerable: true,
|
|
270
276
|
get: function get() {
|
|
271
|
-
return
|
|
277
|
+
return _bufferUtils.toBuffer;
|
|
272
278
|
}
|
|
273
279
|
});
|
|
274
|
-
Object.defineProperty(exports, "
|
|
280
|
+
Object.defineProperty(exports, "window", {
|
|
275
281
|
enumerable: true,
|
|
276
282
|
get: function get() {
|
|
277
|
-
return
|
|
283
|
+
return _globals.window;
|
|
278
284
|
}
|
|
279
285
|
});
|
|
280
|
-
exports.fs = exports.util = exports.path = void 0;
|
|
281
|
-
|
|
282
286
|
var _assert = require("./lib/env-utils/assert");
|
|
283
|
-
|
|
284
287
|
var _globals = require("./lib/env-utils/globals");
|
|
285
|
-
|
|
286
288
|
var _createLoaderWorker = require("./lib/worker-loader-utils/create-loader-worker");
|
|
287
|
-
|
|
288
289
|
var _parseWithWorker = require("./lib/worker-loader-utils/parse-with-worker");
|
|
289
|
-
|
|
290
290
|
var _encodeWithWorker = require("./lib/worker-loader-utils/encode-with-worker");
|
|
291
|
-
|
|
292
291
|
var _parseJson = require("./lib/parser-utils/parse-json");
|
|
293
|
-
|
|
294
292
|
var _arrayBufferUtils = require("./lib/binary-utils/array-buffer-utils");
|
|
295
|
-
|
|
296
293
|
var _memoryCopyUtils = require("./lib/binary-utils/memory-copy-utils");
|
|
297
|
-
|
|
298
294
|
var _binaryCopyUtils = require("./lib/binary-utils/binary-copy-utils");
|
|
299
|
-
|
|
300
295
|
var _encodeUtils = require("./lib/binary-utils/encode-utils");
|
|
301
|
-
|
|
302
296
|
var _getFirstCharacters = require("./lib/binary-utils/get-first-characters");
|
|
303
|
-
|
|
304
297
|
var _textIterators = require("./lib/iterators/text-iterators");
|
|
305
|
-
|
|
306
298
|
var _asyncIteration = require("./lib/iterators/async-iteration");
|
|
307
|
-
|
|
308
299
|
var _requestScheduler = _interopRequireDefault(require("./lib/request-utils/request-scheduler"));
|
|
309
|
-
|
|
310
300
|
var _fileAliases = require("./lib/path-utils/file-aliases");
|
|
311
|
-
|
|
312
301
|
var _jsonLoader = require("./json-loader");
|
|
313
|
-
|
|
314
302
|
var path = _interopRequireWildcard(require("./lib/path-utils/path"));
|
|
315
|
-
|
|
316
303
|
exports.path = path;
|
|
317
|
-
|
|
318
304
|
var _bufferUtils = require("./lib/binary-utils/buffer-utils");
|
|
319
|
-
|
|
320
|
-
var util = _interopRequireWildcard(require("./lib/node/util"));
|
|
321
|
-
|
|
322
|
-
exports.util = util;
|
|
323
|
-
|
|
305
|
+
var _util = require("./lib/node/util");
|
|
324
306
|
var fs = _interopRequireWildcard(require("./lib/node/fs"));
|
|
325
|
-
|
|
326
307
|
exports.fs = fs;
|
|
327
|
-
|
|
328
308
|
var _nodeFilesystem = _interopRequireDefault(require("./lib/filesystems/node-filesystem"));
|
|
329
|
-
|
|
330
309
|
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
|
|
331
|
-
|
|
332
310
|
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
|
|
333
311
|
//# sourceMappingURL=index.js.map
|
package/dist/es5/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"
|
|
1
|
+
{"version":3,"file":"index.js","names":[],"sources":["../../src/index.ts"],"sourcesContent":["// TYPES\nexport type {\n Loader,\n LoaderWithParser,\n LoaderContext,\n LoaderOptions,\n Writer,\n WriterOptions,\n DataType,\n SyncDataType,\n BatchableDataType,\n IFileSystem,\n IRandomAccessReadFileSystem\n} from './types';\n\n// GENERAL UTILS\nexport {assert} from './lib/env-utils/assert';\nexport {\n isBrowser,\n isWorker,\n nodeVersion,\n self,\n window,\n global,\n document\n} from './lib/env-utils/globals';\n\n// LOADERS.GL-SPECIFIC WORKER UTILS\nexport {createLoaderWorker} from './lib/worker-loader-utils/create-loader-worker';\nexport {parseWithWorker, canParseWithWorker} from './lib/worker-loader-utils/parse-with-worker';\nexport {canEncodeWithWorker} from './lib/worker-loader-utils/encode-with-worker';\n\n// PARSER UTILS\nexport {parseJSON} from './lib/parser-utils/parse-json';\n\n// MEMORY COPY UTILS\nexport {\n toArrayBuffer,\n sliceArrayBuffer,\n concatenateArrayBuffers,\n concatenateTypedArrays,\n compareArrayBuffers\n} from './lib/binary-utils/array-buffer-utils';\nexport {padToNBytes, copyToArray, copyArrayBuffer} from './lib/binary-utils/memory-copy-utils';\nexport {\n copyPaddedArrayBufferToDataView,\n copyPaddedStringToDataView\n} from './lib/binary-utils/binary-copy-utils';\nexport {\n padStringToByteAlignment,\n copyStringToDataView,\n copyBinaryToDataView\n} from './lib/binary-utils/encode-utils';\nexport {getFirstCharacters, getMagicString} from './lib/binary-utils/get-first-characters';\n\n// ITERATOR UTILS\nexport {\n makeTextEncoderIterator,\n makeTextDecoderIterator,\n makeLineIterator,\n makeNumberedLineIterator\n} from './lib/iterators/text-iterators';\nexport {forEach, concatenateArrayBuffersAsync} from './lib/iterators/async-iteration';\n\n// REQUEST UTILS\nexport {default as RequestScheduler} from './lib/request-utils/request-scheduler';\n\n// PATH HELPERS\nexport {setPathPrefix, getPathPrefix, resolvePath} from './lib/path-utils/file-aliases';\nexport {addAliases as _addAliases} from './lib/path-utils/file-aliases';\n\n// MICRO LOADERS\nexport {JSONLoader} from './json-loader';\n\n// NODE support\n\n// Node.js emulation (can be used in browser)\n\n// `path` replacement (avoids bundling big path polyfill)\nimport * as path from './lib/path-utils/path';\nexport {path};\n\n// Avoid direct use of `Buffer` which pulls in 50KB polyfill\nexport {isBuffer, toBuffer, bufferToArrayBuffer} from './lib/binary-utils/buffer-utils';\n\n// Note.js wrappers (can be safely imported, but not used in browser)\n\n// Use instead of importing 'util' to avoid node dependencies\nexport {promisify1, promisify2} from './lib/node/util';\n\n// Use instead of importing 'fs' to avoid node dependencies`\nimport * as fs from './lib/node/fs';\nexport {fs};\n\n// EXPERIMENTAL\nexport {default as _NodeFileSystem} from './lib/filesystems/node-filesystem';\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAgBA;AACA;AAWA;AACA;AACA;AAGA;AAGA;AAOA;AACA;AAIA;AAKA;AAGA;AAMA;AAGA;AAGA;AAIA;AAOA;AAA8C;AAI9C;AAKA;AAGA;AAAoC;AAIpC;AAA6E;AAAA"}
|
package/dist/es5/json-loader.js
CHANGED
|
@@ -1,17 +1,14 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
3
|
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
|
-
|
|
5
4
|
Object.defineProperty(exports, "__esModule", {
|
|
6
5
|
value: true
|
|
7
6
|
});
|
|
8
7
|
exports._typecheckJSONLoader = exports.JSONLoader = void 0;
|
|
9
|
-
|
|
10
8
|
var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
|
|
11
|
-
|
|
12
9
|
var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
|
|
10
|
+
var VERSION = typeof "3.3.0-alpha.11" !== 'undefined' ? "3.3.0-alpha.11" : 'latest';
|
|
13
11
|
|
|
14
|
-
var VERSION = typeof "3.3.0-alpha.1" !== 'undefined' ? "3.3.0-alpha.1" : 'latest';
|
|
15
12
|
var JSONLoader = {
|
|
16
13
|
name: 'JSON',
|
|
17
14
|
id: 'json',
|
|
@@ -29,7 +26,6 @@ var JSONLoader = {
|
|
|
29
26
|
switch (_context.prev = _context.next) {
|
|
30
27
|
case 0:
|
|
31
28
|
return _context.abrupt("return", parseTextSync(new TextDecoder().decode(arrayBuffer)));
|
|
32
|
-
|
|
33
29
|
case 1:
|
|
34
30
|
case "end":
|
|
35
31
|
return _context.stop();
|
|
@@ -37,21 +33,18 @@ var JSONLoader = {
|
|
|
37
33
|
}
|
|
38
34
|
}, _callee);
|
|
39
35
|
}));
|
|
40
|
-
|
|
41
36
|
function parse(_x) {
|
|
42
37
|
return _parse.apply(this, arguments);
|
|
43
38
|
}
|
|
44
|
-
|
|
45
39
|
return parse;
|
|
46
40
|
}(),
|
|
47
41
|
options: {}
|
|
48
42
|
};
|
|
49
|
-
exports.JSONLoader = JSONLoader;
|
|
50
43
|
|
|
44
|
+
exports.JSONLoader = JSONLoader;
|
|
51
45
|
function parseTextSync(text) {
|
|
52
46
|
return JSON.parse(text);
|
|
53
47
|
}
|
|
54
|
-
|
|
55
48
|
var _typecheckJSONLoader = JSONLoader;
|
|
56
49
|
exports._typecheckJSONLoader = _typecheckJSONLoader;
|
|
57
50
|
//# sourceMappingURL=json-loader.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"
|
|
1
|
+
{"version":3,"file":"json-loader.js","names":["VERSION","JSONLoader","name","id","module","version","extensions","mimeTypes","category","text","parseTextSync","parse","arrayBuffer","TextDecoder","decode","options","JSON","_typecheckJSONLoader"],"sources":["../../src/json-loader.ts"],"sourcesContent":["import type {LoaderWithParser} from './types';\n\n// __VERSION__ is injected by babel-plugin-version-inline\n// @ts-ignore TS2304: Cannot find name '__VERSION__'.\nconst VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';\n\n/**\n * A JSON Micro loader (minimal bundle size)\n * Alternative to `@loaders.gl/json`\n */\nexport const JSONLoader = {\n name: 'JSON',\n id: 'json',\n module: 'json',\n version: VERSION,\n extensions: ['json', 'geojson'],\n mimeTypes: ['application/json'],\n category: 'json',\n text: true,\n parseTextSync,\n parse: async (arrayBuffer) => parseTextSync(new TextDecoder().decode(arrayBuffer)),\n options: {}\n};\n\n// TODO - deprecated\nfunction parseTextSync(text) {\n return JSON.parse(text);\n}\n\nexport const _typecheckJSONLoader: LoaderWithParser = JSONLoader;\n"],"mappings":";;;;;;;;;AAIA,IAAMA,OAAO,GAAG,uBAAkB,KAAK,WAAW,sBAAiB,QAAQ;;AAMpE,IAAMC,UAAU,GAAG;EACxBC,IAAI,EAAE,MAAM;EACZC,EAAE,EAAE,MAAM;EACVC,MAAM,EAAE,MAAM;EACdC,OAAO,EAAEL,OAAO;EAChBM,UAAU,EAAE,CAAC,MAAM,EAAE,SAAS,CAAC;EAC/BC,SAAS,EAAE,CAAC,kBAAkB,CAAC;EAC/BC,QAAQ,EAAE,MAAM;EAChBC,IAAI,EAAE,IAAI;EACVC,aAAa,EAAbA,aAAa;EACbC,KAAK;IAAA,uEAAE,iBAAOC,WAAW;MAAA;QAAA;UAAA;YAAA;cAAA,iCAAKF,aAAa,CAAC,IAAIG,WAAW,EAAE,CAACC,MAAM,CAACF,WAAW,CAAC,CAAC;YAAA;YAAA;cAAA;UAAA;QAAA;MAAA;IAAA;IAAA;MAAA;IAAA;IAAA;EAAA;EAClFG,OAAO,EAAE,CAAC;AACZ,CAAC;;AAAC;AAGF,SAASL,aAAa,CAACD,IAAI,EAAE;EAC3B,OAAOO,IAAI,CAACL,KAAK,CAACF,IAAI,CAAC;AACzB;AAEO,IAAMQ,oBAAsC,GAAGhB,UAAU;AAAC"}
|
|
@@ -1,31 +1,23 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
3
|
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
|
-
|
|
5
4
|
Object.defineProperty(exports, "__esModule", {
|
|
6
5
|
value: true
|
|
7
6
|
});
|
|
8
|
-
exports.toArrayBuffer = toArrayBuffer;
|
|
9
7
|
exports.compareArrayBuffers = compareArrayBuffers;
|
|
10
8
|
exports.concatenateArrayBuffers = concatenateArrayBuffers;
|
|
11
9
|
exports.concatenateTypedArrays = concatenateTypedArrays;
|
|
12
10
|
exports.sliceArrayBuffer = sliceArrayBuffer;
|
|
13
|
-
|
|
11
|
+
exports.toArrayBuffer = toArrayBuffer;
|
|
14
12
|
var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
|
|
15
|
-
|
|
16
13
|
var _bufferUtils = require("./buffer-utils");
|
|
17
|
-
|
|
18
14
|
function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
|
|
19
|
-
|
|
20
15
|
function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
|
|
21
|
-
|
|
22
16
|
function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
|
|
23
|
-
|
|
24
17
|
function toArrayBuffer(data) {
|
|
25
18
|
if ((0, _bufferUtils.isBuffer)(data)) {
|
|
26
19
|
return (0, _bufferUtils.bufferToArrayBuffer)(data);
|
|
27
20
|
}
|
|
28
|
-
|
|
29
21
|
if (data instanceof ArrayBuffer) {
|
|
30
22
|
return data;
|
|
31
23
|
}
|
|
@@ -34,10 +26,8 @@ function toArrayBuffer(data) {
|
|
|
34
26
|
if (data.byteOffset === 0 && data.byteLength === data.buffer.byteLength) {
|
|
35
27
|
return data.buffer;
|
|
36
28
|
}
|
|
37
|
-
|
|
38
29
|
return data.buffer.slice(data.byteOffset, data.byteOffset + data.byteLength);
|
|
39
30
|
}
|
|
40
|
-
|
|
41
31
|
if (typeof data === 'string') {
|
|
42
32
|
var text = data;
|
|
43
33
|
var uint8Array = new TextEncoder().encode(text);
|
|
@@ -47,26 +37,21 @@ function toArrayBuffer(data) {
|
|
|
47
37
|
if (data && (0, _typeof2.default)(data) === 'object' && data._toArrayBuffer) {
|
|
48
38
|
return data._toArrayBuffer();
|
|
49
39
|
}
|
|
50
|
-
|
|
51
40
|
throw new Error('toArrayBuffer');
|
|
52
41
|
}
|
|
53
42
|
|
|
54
43
|
function compareArrayBuffers(arrayBuffer1, arrayBuffer2, byteLength) {
|
|
55
44
|
byteLength = byteLength || arrayBuffer1.byteLength;
|
|
56
|
-
|
|
57
45
|
if (arrayBuffer1.byteLength < byteLength || arrayBuffer2.byteLength < byteLength) {
|
|
58
46
|
return false;
|
|
59
47
|
}
|
|
60
|
-
|
|
61
48
|
var array1 = new Uint8Array(arrayBuffer1);
|
|
62
49
|
var array2 = new Uint8Array(arrayBuffer2);
|
|
63
|
-
|
|
64
50
|
for (var i = 0; i < array1.length; ++i) {
|
|
65
51
|
if (array1[i] !== array2[i]) {
|
|
66
52
|
return false;
|
|
67
53
|
}
|
|
68
54
|
}
|
|
69
|
-
|
|
70
55
|
return true;
|
|
71
56
|
}
|
|
72
57
|
|
|
@@ -74,31 +59,31 @@ function concatenateArrayBuffers() {
|
|
|
74
59
|
for (var _len = arguments.length, sources = new Array(_len), _key = 0; _key < _len; _key++) {
|
|
75
60
|
sources[_key] = arguments[_key];
|
|
76
61
|
}
|
|
77
|
-
|
|
78
62
|
var sourceArrays = sources.map(function (source2) {
|
|
79
63
|
return source2 instanceof ArrayBuffer ? new Uint8Array(source2) : source2;
|
|
80
64
|
});
|
|
65
|
+
|
|
81
66
|
var byteLength = sourceArrays.reduce(function (length, typedArray) {
|
|
82
67
|
return length + typedArray.byteLength;
|
|
83
68
|
}, 0);
|
|
69
|
+
|
|
84
70
|
var result = new Uint8Array(byteLength);
|
|
85
|
-
var offset = 0;
|
|
86
71
|
|
|
72
|
+
var offset = 0;
|
|
87
73
|
var _iterator = _createForOfIteratorHelper(sourceArrays),
|
|
88
|
-
|
|
89
|
-
|
|
74
|
+
_step;
|
|
90
75
|
try {
|
|
91
76
|
for (_iterator.s(); !(_step = _iterator.n()).done;) {
|
|
92
77
|
var sourceArray = _step.value;
|
|
93
78
|
result.set(sourceArray, offset);
|
|
94
79
|
offset += sourceArray.byteLength;
|
|
95
80
|
}
|
|
81
|
+
|
|
96
82
|
} catch (err) {
|
|
97
83
|
_iterator.e(err);
|
|
98
84
|
} finally {
|
|
99
85
|
_iterator.f();
|
|
100
86
|
}
|
|
101
|
-
|
|
102
87
|
return result.buffer;
|
|
103
88
|
}
|
|
104
89
|
|
|
@@ -106,26 +91,21 @@ function concatenateTypedArrays() {
|
|
|
106
91
|
for (var _len2 = arguments.length, typedArrays = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
|
|
107
92
|
typedArrays[_key2] = arguments[_key2];
|
|
108
93
|
}
|
|
109
|
-
|
|
110
94
|
var arrays = typedArrays;
|
|
111
95
|
var TypedArrayConstructor = arrays && arrays.length > 1 && arrays[0].constructor || null;
|
|
112
|
-
|
|
113
96
|
if (!TypedArrayConstructor) {
|
|
114
97
|
throw new Error('"concatenateTypedArrays" - incorrect quantity of arguments or arguments have incompatible data types');
|
|
115
98
|
}
|
|
116
|
-
|
|
117
99
|
var sumLength = arrays.reduce(function (acc, value) {
|
|
118
100
|
return acc + value.length;
|
|
119
101
|
}, 0);
|
|
120
102
|
var result = new TypedArrayConstructor(sumLength);
|
|
121
103
|
var offset = 0;
|
|
122
|
-
|
|
123
104
|
for (var _i = 0, _arrays = arrays; _i < _arrays.length; _i++) {
|
|
124
105
|
var array = _arrays[_i];
|
|
125
106
|
result.set(array, offset);
|
|
126
107
|
offset += array.length;
|
|
127
108
|
}
|
|
128
|
-
|
|
129
109
|
return result;
|
|
130
110
|
}
|
|
131
111
|
|