Skip to content

Commit f3f330b

Browse files
committed
Add extensions from IANA for model/* types
1 parent 9dee875 commit f3f330b

File tree

5 files changed

+39
-22
lines changed

5 files changed

+39
-22
lines changed

HISTORY.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
unreleased
22
==========
33

4+
* Add extensions from IANA for `model/*` types
45
* Add `text/mdx` with extension `.mdx`
56

67
1.39.0 / 2019-04-04

db.json

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6899,7 +6899,8 @@
68996899
"extensions": ["wsc"]
69006900
},
69016901
"model/3mf": {
6902-
"source": "iana"
6902+
"source": "iana",
6903+
"extensions": ["3mf"]
69036904
},
69046905
"model/gltf+json": {
69056906
"source": "iana",
@@ -6922,7 +6923,8 @@
69226923
"extensions": ["msh","mesh","silo"]
69236924
},
69246925
"model/stl": {
6925-
"source": "iana"
6926+
"source": "iana",
6927+
"extensions": ["stl"]
69266928
},
69276929
"model/vnd.collada+xml": {
69286930
"source": "iana",
@@ -6959,23 +6961,28 @@
69596961
"extensions": ["mts"]
69606962
},
69616963
"model/vnd.opengex": {
6962-
"source": "iana"
6964+
"source": "iana",
6965+
"extensions": ["ogex"]
69636966
},
69646967
"model/vnd.parasolid.transmit.binary": {
6965-
"source": "iana"
6968+
"source": "iana",
6969+
"extensions": ["x_b"]
69666970
},
69676971
"model/vnd.parasolid.transmit.text": {
6968-
"source": "iana"
6972+
"source": "iana",
6973+
"extensions": ["x_t"]
69696974
},
69706975
"model/vnd.rosette.annotated-data-model": {
69716976
"source": "iana"
69726977
},
69736978
"model/vnd.usdz+zip": {
69746979
"source": "iana",
6975-
"compressible": false
6980+
"compressible": false,
6981+
"extensions": ["usdz"]
69766982
},
69776983
"model/vnd.valve.source.compiled-map": {
6978-
"source": "iana"
6984+
"source": "iana",
6985+
"extensions": ["bsp"]
69796986
},
69806987
"model/vnd.vtu": {
69816988
"source": "iana",
@@ -6992,7 +6999,8 @@
69926999
"extensions": ["x3db","x3dbz"]
69937000
},
69947001
"model/x3d+fastinfoset": {
6995-
"source": "iana"
7002+
"source": "iana",
7003+
"extensions": ["x3db"]
69967004
},
69977005
"model/x3d+vrml": {
69987006
"source": "apache",
@@ -7005,7 +7013,8 @@
70057013
"extensions": ["x3d","x3dz"]
70067014
},
70077015
"model/x3d-vrml": {
7008-
"source": "iana"
7016+
"source": "iana",
7017+
"extensions": ["x3dv"]
70097018
},
70107019
"multipart/alternative": {
70117020
"source": "iana",

scripts/fetch-iana.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ var parser = require('csv-parse')
1212
var toArray = require('stream-to-array')
1313
var writedb = require('./lib/write-db')
1414

15-
var extensionsRegExp = /^\s*(?:\d\.\s+)?File extension(?:\(s\)|s|)\s?:\s+(?:\*\.|\.|)([0-9a-z_-]+)\s*(?:\(|$)/im
15+
var extensionsRegExp = /(?:^\s*(?:\d\.\s+)?|\s+3\.\s+)File extension(?:\(s\)|s|)\s?:\s+(?:\*\.|\.|)([0-9a-z_-]+)\s*(?:\(|4\.\s+|$)/im
1616
var extensionsQuotedRegExp = /^\s*(?:\d\.\s+)?File extension(?:\(s\)|s|)\s?:(?:[^'"\r\n]+)(?:"\.?([0-9a-z_-]+)"|'\.?([0-9a-z_-]+)')/im
1717
var intendedUsageRegExp = /^\s*(?:(?:\d{1,2}\.|o)\s+)?Intended\s+Usage\s*:\s*(\S+)/im
1818
var leadingSpacesRegExp = /^\s+/
@@ -34,7 +34,7 @@ co(function * () {
3434
get('font', { extensions: true }),
3535
get('image', { extensions: true }),
3636
get('message', { extensions: true }),
37-
get('model'),
37+
get('model', { extensions: true }),
3838
get('multipart'),
3939
get('text'),
4040
get('video')

src/custom-types.json

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -639,18 +639,8 @@
639639
"http://en.wikipedia.org/wiki/MIME#Multipart_subtypes"
640640
]
641641
},
642-
"model/gltf+json": {
643-
"extensions": ["gltf"],
644-
"sources": [
645-
"https://github.com/KhronosGroup/glTF/tree/master/specification/2.0"
646-
]
647-
},
648642
"model/gltf-binary": {
649-
"compressible": true,
650-
"extensions": ["glb"],
651-
"sources": [
652-
"https://github.com/KhronosGroup/glTF/tree/master/specification/2.0#glb-file-format-specification"
653-
]
643+
"compressible": true
654644
},
655645
"model/iges": {
656646
"compressible": false

src/iana-types.json

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8408,17 +8408,20 @@
84088408
]
84098409
},
84108410
"model/3mf": {
8411+
"extensions": ["3mf"],
84118412
"sources": [
84128413
"http://www.3mf.io/specification",
84138414
"http://www.iana.org/assignments/media-types/model/3mf"
84148415
]
84158416
},
84168417
"model/gltf+json": {
8418+
"extensions": ["gltf"],
84178419
"sources": [
84188420
"http://www.iana.org/assignments/media-types/model/gltf+json"
84198421
]
84208422
},
84218423
"model/gltf-binary": {
8424+
"extensions": ["glb"],
84228425
"sources": [
84238426
"http://www.iana.org/assignments/media-types/model/gltf-binary"
84248427
]
@@ -8434,16 +8437,19 @@
84348437
]
84358438
},
84368439
"model/stl": {
8440+
"extensions": ["stl"],
84378441
"sources": [
84388442
"http://www.iana.org/assignments/media-types/model/stl"
84398443
]
84408444
},
84418445
"model/vnd.collada+xml": {
8446+
"extensions": ["dae"],
84428447
"sources": [
84438448
"http://www.iana.org/assignments/media-types/model/vnd.collada+xml"
84448449
]
84458450
},
84468451
"model/vnd.dwf": {
8452+
"extensions": ["dwf"],
84478453
"sources": [
84488454
"http://www.iana.org/assignments/media-types/model/vnd.dwf"
84498455
]
@@ -8464,6 +8470,7 @@
84648470
]
84658471
},
84668472
"model/vnd.gtw": {
8473+
"extensions": ["gtw"],
84678474
"sources": [
84688475
"http://www.iana.org/assignments/media-types/model/vnd.gtw"
84698476
]
@@ -8474,21 +8481,25 @@
84748481
]
84758482
},
84768483
"model/vnd.mts": {
8484+
"extensions": ["mts"],
84778485
"sources": [
84788486
"http://www.iana.org/assignments/media-types/model/vnd.mts"
84798487
]
84808488
},
84818489
"model/vnd.opengex": {
8490+
"extensions": ["ogex"],
84828491
"sources": [
84838492
"http://www.iana.org/assignments/media-types/model/vnd.opengex"
84848493
]
84858494
},
84868495
"model/vnd.parasolid.transmit.binary": {
8496+
"extensions": ["x_b"],
84878497
"sources": [
84888498
"http://www.iana.org/assignments/media-types/model/vnd.parasolid.transmit.binary"
84898499
]
84908500
},
84918501
"model/vnd.parasolid.transmit.text": {
8502+
"extensions": ["x_t"],
84928503
"sources": [
84938504
"http://www.iana.org/assignments/media-types/model/vnd.parasolid.transmit.text"
84948505
]
@@ -8499,16 +8510,19 @@
84998510
]
85008511
},
85018512
"model/vnd.usdz+zip": {
8513+
"extensions": ["usdz"],
85028514
"sources": [
85038515
"http://www.iana.org/assignments/media-types/model/vnd.usdz+zip"
85048516
]
85058517
},
85068518
"model/vnd.valve.source.compiled-map": {
8519+
"extensions": ["bsp"],
85078520
"sources": [
85088521
"http://www.iana.org/assignments/media-types/model/vnd.valve.source.compiled-map"
85098522
]
85108523
},
85118524
"model/vnd.vtu": {
8525+
"extensions": ["vtu"],
85128526
"sources": [
85138527
"http://www.iana.org/assignments/media-types/model/vnd.vtu"
85148528
]
@@ -8519,16 +8533,19 @@
85198533
]
85208534
},
85218535
"model/x3d+fastinfoset": {
8536+
"extensions": ["x3db"],
85228537
"sources": [
85238538
"http://www.iana.org/assignments/media-types/model/x3d+fastinfoset"
85248539
]
85258540
},
85268541
"model/x3d+xml": {
8542+
"extensions": ["x3d"],
85278543
"sources": [
85288544
"http://www.iana.org/assignments/media-types/model/x3d+xml"
85298545
]
85308546
},
85318547
"model/x3d-vrml": {
8548+
"extensions": ["x3dv"],
85328549
"sources": [
85338550
"http://www.iana.org/assignments/media-types/model/x3d-vrml"
85348551
]

0 commit comments

Comments
 (0)