Skip to content

Commit bc7bb9f

Browse files
authored
Remove File and Review objects (#20)
* Handle falsy values in File and Reviews * Bump version * Remove File and Review objects They're specific to the metadata-service response * Add more nullish checks
1 parent 806b10e commit bc7bb9f

9 files changed

Lines changed: 23 additions & 260 deletions

File tree

index.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
// top level models
2-
export { File } from './src/models/file';
32
export { Metadata } from './src/models/metadata';
4-
export { Review } from './src/models/review';
5-
export { SpeechMusicASREntry } from './src/models/speech-music-asr-entry';
63

74
// metadata field types
85
export { BooleanField } from './src/models/metadata-fields/field-types/boolean';

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
},
88
"license": "AGPL-3.0-only",
99
"author": "Internet Archive",
10-
"version": "1.0.3",
10+
"version": "1.0.4",
1111
"main": "dist/index.js",
1212
"module": "dist/index.js",
1313
"scripts": {

src/models/file.ts

Lines changed: 0 additions & 106 deletions
This file was deleted.

src/models/metadata.ts

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -296,25 +296,25 @@ export class Metadata {
296296
}
297297

298298
@Memoize() get openlibrary_edition(): StringField | undefined {
299-
return this.rawMetadata.openlibrary_edition
299+
return this.rawMetadata.openlibrary_edition != null
300300
? new StringField(this.rawMetadata.openlibrary_edition)
301301
: undefined;
302302
}
303303

304304
@Memoize() get openlibrary_work(): StringField | undefined {
305-
return this.rawMetadata.openlibrary_work
305+
return this.rawMetadata.openlibrary_work != null
306306
? new StringField(this.rawMetadata.openlibrary_work)
307307
: undefined;
308308
}
309309

310310
@Memoize() get page_progression(): PageProgressionField | undefined {
311-
return this.rawMetadata.page_progression
311+
return this.rawMetadata.page_progression != null
312312
? new PageProgressionField(this.rawMetadata.page_progression)
313313
: undefined;
314314
}
315315

316316
@Memoize() get partner(): StringField | undefined {
317-
return this.rawMetadata.partner
317+
return this.rawMetadata.partner != null
318318
? new StringField(this.rawMetadata.partner)
319319
: undefined;
320320
}
@@ -326,19 +326,19 @@ export class Metadata {
326326
}
327327

328328
@Memoize() get publicdate(): DateField | undefined {
329-
return this.rawMetadata.publicdate
329+
return this.rawMetadata.publicdate != null
330330
? new DateField(this.rawMetadata.publicdate)
331331
: undefined;
332332
}
333333

334334
@Memoize() get publisher(): StringField | undefined {
335-
return this.rawMetadata.publisher
335+
return this.rawMetadata.publisher != null
336336
? new StringField(this.rawMetadata.publisher)
337337
: undefined;
338338
}
339339

340340
@Memoize() get reviewdate(): DateField | undefined {
341-
return this.rawMetadata.reviewdate
341+
return this.rawMetadata.reviewdate != null
342342
? new DateField(this.rawMetadata.reviewdate)
343343
: undefined;
344344
}
@@ -350,55 +350,55 @@ export class Metadata {
350350
}
351351

352352
@Memoize() get scanner(): StringField | undefined {
353-
return this.rawMetadata.scanner
353+
return this.rawMetadata.scanner != null
354354
? new StringField(this.rawMetadata.scanner)
355355
: undefined;
356356
}
357357

358358
@Memoize() get source(): StringField | undefined {
359-
return this.rawMetadata.source
359+
return this.rawMetadata.source != null
360360
? new StringField(this.rawMetadata.source)
361361
: undefined;
362362
}
363363

364364
@Memoize() get start_localtime(): DateField | undefined {
365-
return this.rawMetadata.start_localtime
365+
return this.rawMetadata.start_localtime != null
366366
? new DateField(this.rawMetadata.start_localtime)
367367
: undefined;
368368
}
369369

370370
@Memoize() get start_time(): DateField | undefined {
371-
return this.rawMetadata.start_time
371+
return this.rawMetadata.start_time != null
372372
? new DateField(this.rawMetadata.start_time)
373373
: undefined;
374374
}
375375

376376
@Memoize() get stop_time(): DateField | undefined {
377-
return this.rawMetadata.stop_time
377+
return this.rawMetadata.stop_time != null
378378
? new DateField(this.rawMetadata.stop_time)
379379
: undefined;
380380
}
381381

382382
@Memoize() get subject(): StringListField | undefined {
383-
return this.rawMetadata.subject
383+
return this.rawMetadata.subject != null
384384
? new StringListField(this.rawMetadata.subject)
385385
: undefined;
386386
}
387387

388388
@Memoize() get taper(): StringField | undefined {
389-
return this.rawMetadata.taper
389+
return this.rawMetadata.taper != null
390390
? new StringField(this.rawMetadata.taper)
391391
: undefined;
392392
}
393393

394394
@Memoize() get title(): StringField | undefined {
395-
return this.rawMetadata.title
395+
return this.rawMetadata.title != null
396396
? new StringField(this.rawMetadata.title)
397397
: undefined;
398398
}
399399

400400
@Memoize() get transferer(): StringField | undefined {
401-
return this.rawMetadata.transferer
401+
return this.rawMetadata.transferer != null
402402
? new StringField(this.rawMetadata.transferer)
403403
: undefined;
404404
}
@@ -410,13 +410,13 @@ export class Metadata {
410410
}
411411

412412
@Memoize() get type(): StringField | undefined {
413-
return this.rawMetadata.type
413+
return this.rawMetadata.type != null
414414
? new StringField(this.rawMetadata.type)
415415
: undefined;
416416
}
417417

418418
@Memoize() get uploader(): StringField | undefined {
419-
return this.rawMetadata.uploader
419+
return this.rawMetadata.uploader != null
420420
? new StringField(this.rawMetadata.uploader)
421421
: undefined;
422422
}
@@ -428,13 +428,13 @@ export class Metadata {
428428
}
429429

430430
@Memoize() get venue(): StringField | undefined {
431-
return this.rawMetadata.venue
431+
return this.rawMetadata.venue != null
432432
? new StringField(this.rawMetadata.venue)
433433
: undefined;
434434
}
435435

436436
@Memoize() get volume(): StringField | undefined {
437-
return this.rawMetadata.volume
437+
return this.rawMetadata.volume != null
438438
? new StringField(this.rawMetadata.volume)
439439
: undefined;
440440
}

src/models/review.ts

Lines changed: 0 additions & 42 deletions
This file was deleted.

src/models/speech-music-asr-entry.ts

Lines changed: 0 additions & 10 deletions
This file was deleted.

test/models/file.test.ts

Lines changed: 0 additions & 40 deletions
This file was deleted.

0 commit comments

Comments
 (0)