dtsgenerator 2.0.0 → 2.0.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dtsgenerator",
-  "version": "2.0.0",
+  "version": "2.0.6",
   "description": "TypeScript d.ts file generator for JSON Schema file",
   "bin": {
     "dtsgen": "./bin/dtsgen"
@@ -10,7 +10,7 @@
   "scripts": {
     "clean": "rimraf dist/ **/*.js **/*.js.map",
     "build": "tsc -p ./tsconfig-build.json",
-    "prepublish": "npm run build",
+    "prepublishOnly": "npm run build",
     "precompile": "tslint --project ./tsconfig.json",
     "compile": "tsc -p .",
     "watch": "npm run compile -- -w",
@@ -25,7 +25,8 @@
   },
   "keywords": [
     "TypeScript",
-    "JSON Schema"
+    "JSON Schema",
+    "OpenAPI"
   ],
   "author": "horiuchi",
   "license": "MIT",
@@ -42,29 +43,29 @@
   },
   "dependencies": {
     "commander": "^2.19.0",
-    "cross-fetch": "^2.2.2",
-    "debug": "^4.1.0",
+    "cross-fetch": "^3.0.1",
+    "debug": "^4.1.1",
     "glob": "^7.1.3",
-    "js-yaml": "^3.12.0",
+    "js-yaml": "^3.12.1",
     "mkdirp": "^0.5.1",
     "tslib": "^1.9.3"
   },
   "devDependencies": {
-    "@types/debug": "^0.0.31",
+    "@types/debug": "^4.1.0",
     "@types/glob": "^7.1.1",
-    "@types/js-yaml": "3.11.2",
+    "@types/js-yaml": "3.12.0",
     "@types/mkdirp": "^0.5.2",
     "@types/mocha": "^5.2.5",
-    "@types/node": "^10.12.0",
+    "@types/node": "^10.12.26",
     "@types/power-assert": "^1.5.0",
     "coveralls": "^3.0.2",
     "istanbul": "^0.4.5",
     "mocha": "^5.2.0",
     "power-assert": "^1.6.1",
-    "remap-istanbul": "^0.12.0",
-    "rimraf": "^2.6.2",
-    "source-map-support": "^0.5.9",
-    "tslint": "^5.11.0",
-    "typescript": "^3.1.3"
+    "remap-istanbul": "^0.13.0",
+    "rimraf": "^2.6.3",
+    "source-map-support": "^0.5.10",
+    "tslint": "^5.12.1",
+    "typescript": "^3.3.3"
   }
 }

package/src/core/dtsGenerator.js

@@ -0,0 +1,327 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var tslib_1 = require("tslib");
+var debug_1 = tslib_1.__importDefault(require("debug"));
+var jsonPointer_1 = require("../jsonPointer");
+var jsonSchema_1 = require("./jsonSchema");
+var utils = tslib_1.__importStar(require("./utils"));
+var debug = debug_1.default('dtsgen');
+var typeMarker = Symbol();
+var DtsGenerator = /** @class */ (function () {
+    function DtsGenerator(resolver, convertor) {
+        this.resolver = resolver;
+        this.convertor = convertor;
+    }
+    DtsGenerator.prototype.generate = function () {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var map, result;
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        debug('generate type definition files.');
+                        return [4 /*yield*/, this.resolver.resolve()];
+                    case 1:
+                        _a.sent();
+                        map = this.convertor.buildSchemaMergedMap(this.resolver.getAllRegisteredSchema(), typeMarker);
+                        this.convertor.start();
+                        this.walk(map);
+                        result = this.convertor.end();
+                        return [2 /*return*/, result];
+                }
+            });
+        });
+    };
+    DtsGenerator.prototype.walk = function (map) {
+        var e_1, _a;
+        var keys = Object.keys(map).sort();
+        try {
+            for (var keys_1 = tslib_1.__values(keys), keys_1_1 = keys_1.next(); !keys_1_1.done; keys_1_1 = keys_1.next()) {
+                var key = keys_1_1.value;
+                var value = map[key];
+                if (value.hasOwnProperty(typeMarker)) {
+                    var schema = value[typeMarker];
+                    debug("  walk doProcess: key=" + key + " schemaId=" + schema.id.getAbsoluteId());
+                    this.walkSchema(schema);
+                    delete value[typeMarker];
+                }
+                if (typeof value === 'object' && Object.keys(value).length > 0) {
+                    this.convertor.startNest(key);
+                    this.walk(value);
+                    this.convertor.endNest();
+                }
+            }
+        }
+        catch (e_1_1) { e_1 = { error: e_1_1 }; }
+        finally {
+            try {
+                if (keys_1_1 && !keys_1_1.done && (_a = keys_1.return)) _a.call(keys_1);
+            }
+            finally { if (e_1) throw e_1.error; }
+        }
+    };
+    DtsGenerator.prototype.walkSchema = function (schema) {
+        var normalized = this.normalizeContent(schema);
+        this.currentSchema = normalized;
+        this.convertor.outputComments(normalized);
+        var type = normalized.content.type;
+        switch (type) {
+            case 'object':
+            case 'any':
+                return this.generateTypeModel(normalized);
+            case 'array':
+                return this.generateTypeCollection(normalized);
+            default:
+                return this.generateDeclareType(normalized);
+        }
+    };
+    DtsGenerator.prototype.normalizeContent = function (schema, pointer) {
+        var e_2, _a;
+        if (pointer != null) {
+            schema = jsonSchema_1.getSubSchema(schema, pointer);
+        }
+        var content = schema.content;
+        if (typeof content === 'boolean') {
+            content = content ? {} : { not: {} };
+        }
+        else {
+            if (content.allOf) {
+                var work = content;
+                try {
+                    for (var _b = tslib_1.__values(content.allOf), _c = _b.next(); !_c.done; _c = _b.next()) {
+                        var sub = _c.value;
+                        if (typeof sub === 'object' && sub.$ref) {
+                            var ref = this.resolver.dereference(sub.$ref);
+                            sub = this.normalizeContent(ref).content;
+                        }
+                        utils.mergeSchema(work, sub);
+                    }
+                }
+                catch (e_2_1) { e_2 = { error: e_2_1 }; }
+                finally {
+                    try {
+                        if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+                    }
+                    finally { if (e_2) throw e_2.error; }
+                }
+                delete content.allOf;
+                content = work;
+            }
+            if (content.type === undefined && (content.properties || content.additionalProperties)) {
+                content.type = 'object';
+            }
+            if (content.nullable) {
+                var type = content.type;
+                if (type == null) {
+                    content.type = 'null';
+                }
+                else if (!Array.isArray(type)) {
+                    content.type = [type, 'null'];
+                }
+                else {
+                    type.push('null');
+                }
+            }
+            var types = content.type;
+            if (Array.isArray(types)) {
+                var reduced = utils.reduceTypes(types);
+                content.type = reduced.length === 1 ? reduced[0] : reduced;
+            }
+        }
+        return Object.assign({}, schema, { content: content });
+    };
+    DtsGenerator.prototype.generateDeclareType = function (schema) {
+        this.convertor.outputExportType(schema.id);
+        this.generateTypeProperty(schema, true);
+    };
+    DtsGenerator.prototype.generateTypeModel = function (schema) {
+        this.convertor.startInterfaceNest(schema.id);
+        if (schema.content.type === 'any') {
+            this.convertor.outputRawValue('[name: string]: any; // any', true);
+        }
+        this.generateProperties(schema);
+        this.convertor.endInterfaceNest();
+    };
+    DtsGenerator.prototype.generateTypeCollection = function (schema) {
+        this.convertor.outputExportType(schema.id);
+        this.generateArrayTypeProperty(schema, true);
+    };
+    DtsGenerator.prototype.generateProperties = function (baseSchema) {
+        var e_3, _a;
+        var content = baseSchema.content;
+        if (content.additionalProperties) {
+            this.convertor.outputRawValue('[name: string]: ');
+            var schema = this.normalizeContent(baseSchema, '/additionalProperties');
+            if (content.additionalProperties === true) {
+                this.convertor.outputStringTypeName(schema, 'any', true);
+            }
+            else {
+                this.generateTypeProperty(schema, true);
+            }
+        }
+        if (content.properties) {
+            try {
+                for (var _b = tslib_1.__values(Object.keys(content.properties)), _c = _b.next(); !_c.done; _c = _b.next()) {
+                    var propertyName = _c.value;
+                    var schema = this.normalizeContent(baseSchema, '/properties/' + jsonPointer_1.tilde(propertyName));
+                    this.convertor.outputComments(schema);
+                    this.convertor.outputPropertyAttribute(schema);
+                    this.convertor.outputPropertyName(schema, propertyName, baseSchema.content.required);
+                    this.generateTypeProperty(schema);
+                }
+            }
+            catch (e_3_1) { e_3 = { error: e_3_1 }; }
+            finally {
+                try {
+                    if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+                }
+                finally { if (e_3) throw e_3.error; }
+            }
+        }
+    };
+    DtsGenerator.prototype.generateTypeProperty = function (schema, terminate) {
+        var _this = this;
+        if (terminate === void 0) { terminate = true; }
+        var content = schema.content;
+        if (content.$ref) {
+            var ref = this.resolver.dereference(content.$ref);
+            if (ref.id == null) {
+                throw new Error('target referenced id is nothing: ' + content.$ref);
+            }
+            var refSchema = this.normalizeContent(ref);
+            return this.convertor.outputTypeIdName(refSchema, this.currentSchema, terminate);
+        }
+        if (content.anyOf || content.oneOf) {
+            this.generateArrayedType(schema, content.anyOf, '/anyOf/', terminate);
+            this.generateArrayedType(schema, content.oneOf, '/oneOf/', terminate);
+            return;
+        }
+        if (content.enum) {
+            this.convertor.outputArrayedType(schema, content.enum, function (value) {
+                if (content.type === 'integer') {
+                    _this.convertor.outputRawValue('' + value);
+                }
+                else {
+                    _this.convertor.outputRawValue("\"" + value + "\"");
+                }
+            }, terminate);
+        }
+        else if ('const' in content) {
+            var value = content.const;
+            if (content.type === 'integer') {
+                this.convertor.outputStringTypeName(schema, '' + value, terminate);
+            }
+            else {
+                this.convertor.outputStringTypeName(schema, "\"" + value + "\"", terminate);
+            }
+        }
+        else {
+            this.generateType(schema, terminate);
+        }
+    };
+    DtsGenerator.prototype.generateArrayedType = function (baseSchema, contents, path, terminate) {
+        var _this = this;
+        if (contents) {
+            this.convertor.outputArrayedType(baseSchema, contents, function (_content, index) {
+                var schema = _this.normalizeContent(baseSchema, path + index);
+                if (schema.id.isEmpty()) {
+                    _this.generateTypeProperty(schema, false);
+                }
+                else {
+                    _this.convertor.outputTypeIdName(schema, _this.currentSchema, false);
+                }
+            }, terminate);
+        }
+    };
+    DtsGenerator.prototype.generateArrayTypeProperty = function (schema, terminate) {
+        if (terminate === void 0) { terminate = true; }
+        var items = schema.content.items;
+        var minItems = schema.content.minItems;
+        if (items == null) {
+            this.convertor.outputStringTypeName(schema, 'any[]', terminate);
+        }
+        else if (!Array.isArray(items)) {
+            this.generateTypeProperty(this.normalizeContent(schema, '/items'), false);
+            this.convertor.outputStringTypeName(schema, '[]', terminate);
+        }
+        else if (items.length === 0 && minItems === undefined) {
+            this.convertor.outputStringTypeName(schema, 'any[]', terminate);
+        }
+        else {
+            var effectiveMaxItems = 1 + Math.max(minItems || 0, items.length);
+            for (var unionIndex = minItems === undefined ? 1 : minItems; unionIndex <= effectiveMaxItems; unionIndex++) {
+                this.convertor.outputRawValue('[');
+                for (var i = 0; i < unionIndex; i++) {
+                    if (i > 0) {
+                        this.convertor.outputRawValue(', ');
+                    }
+                    if (i < items.length) {
+                        var type = this.normalizeContent(schema, '/items/' + i);
+                        if (type.id.isEmpty()) {
+                            this.generateTypeProperty(type, false);
+                        }
+                        else {
+                            this.convertor.outputTypeIdName(type, this.currentSchema, false);
+                        }
+                    }
+                    else {
+                        if (i < effectiveMaxItems - 1) {
+                            this.convertor.outputStringTypeName(schema, 'Object', false, false);
+                        }
+                        else {
+                            this.convertor.outputStringTypeName(schema, 'any', false, false);
+                        }
+                    }
+                }
+                this.convertor.outputRawValue(']');
+                if (unionIndex < effectiveMaxItems) {
+                    this.convertor.outputRawValue(' | ');
+                }
+            }
+            this.convertor.outputStringTypeName(schema, '', terminate);
+        }
+    };
+    DtsGenerator.prototype.generateType = function (schema, terminate, outputOptional) {
+        var _this = this;
+        if (outputOptional === void 0) { outputOptional = true; }
+        var type = schema.content.type;
+        if (type == null) {
+            this.convertor.outputPrimitiveTypeName(schema, 'any', terminate, outputOptional);
+        }
+        else if (typeof type === 'string') {
+            this.generateTypeName(schema, type, terminate, outputOptional);
+        }
+        else {
+            var types = utils.reduceTypes(type);
+            if (types.length <= 1) {
+                schema.content.type = types[0];
+                this.generateType(schema, terminate, outputOptional);
+            }
+            else {
+                this.convertor.outputArrayedType(schema, types, function (t) {
+                    _this.generateTypeName(schema, t, false, false);
+                }, terminate);
+            }
+        }
+    };
+    DtsGenerator.prototype.generateTypeName = function (schema, type, terminate, outputOptional) {
+        if (outputOptional === void 0) { outputOptional = true; }
+        var tsType = utils.toTSType(type, schema.content);
+        if (tsType) {
+            this.convertor.outputPrimitiveTypeName(schema, tsType, terminate, outputOptional);
+        }
+        else if (type === 'object') {
+            this.convertor.startTypeNest();
+            this.generateProperties(schema);
+            this.convertor.endTypeNest(terminate);
+        }
+        else if (type === 'array') {
+            this.generateArrayTypeProperty(schema, terminate);
+        }
+        else {
+            throw new Error('unknown type: ' + type);
+        }
+    };
+    return DtsGenerator;
+}());
+exports.default = DtsGenerator;
+//# sourceMappingURL=dtsGenerator.js.map

package/src/core/dtsGenerator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"dtsGenerator.js","sourceRoot":"","sources":["dtsGenerator.ts"],"names":[],"mappings":"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"}

package/src/core/dtsGenerator.ts

@@ -1,4 +1,5 @@
 import Debug from 'debug';
+import { tilde } from '../jsonPointer';
 import { getSubSchema, JsonSchema, NormalizedSchema, Schema } from './jsonSchema';
 import ReferenceResolver from './referenceResolver';
 import SchemaConvertor from './schemaConvertor';
@@ -80,10 +81,21 @@ export default class DtsGenerator {
                 delete content.allOf;
                 content = work;
             }
-            const types = content.type;
-            if (types === undefined && (content.properties || content.additionalProperties)) {
+            if (content.type === undefined && (content.properties || content.additionalProperties)) {
                 content.type = 'object';
-            } else if (Array.isArray(types)) {
+            }
+            if (content.nullable) {
+                const type = content.type;
+                if (type == null) {
+                    content.type = 'null';
+                } else if (!Array.isArray(type)) {
+                    content.type = [type, 'null'];
+                } else {
+                    type.push('null');
+                }
+            }
+            const types = content.type;
+            if (Array.isArray(types)) {
                 const reduced = utils.reduceTypes(types);
                 content.type = reduced.length === 1 ? reduced[0] : reduced;
             }
@@ -122,7 +134,7 @@ export default class DtsGenerator {
         }
         if (content.properties) {
             for (const propertyName of Object.keys(content.properties)) {
-                const schema = this.normalizeContent(baseSchema, '/properties/' + propertyName);
+                const schema = this.normalizeContent(baseSchema, '/properties/' + tilde(propertyName));
                 this.convertor.outputComments(schema);
                 this.convertor.outputPropertyAttribute(schema);
                 this.convertor.outputPropertyName(schema, propertyName, baseSchema.content.required);

package/src/core/index.js

@@ -0,0 +1,41 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var tslib_1 = require("tslib");
+var dtsGenerator_1 = tslib_1.__importDefault(require("./dtsGenerator"));
+var jsonSchema_1 = require("./jsonSchema");
+var referenceResolver_1 = tslib_1.__importDefault(require("./referenceResolver"));
+var schemaConvertor_1 = tslib_1.__importDefault(require("./schemaConvertor"));
+var writeProcessor_1 = tslib_1.__importDefault(require("./writeProcessor"));
+var schemaId_1 = require("./schemaId");
+exports.SchemaId = schemaId_1.default;
+var typeNameConvertor_1 = require("./typeNameConvertor");
+exports.DefaultTypeNameConvertor = typeNameConvertor_1.DefaultTypeNameConvertor;
+function dtsGenerator(options) {
+    return tslib_1.__awaiter(this, void 0, void 0, function () {
+        var processor, resolver, convertor, generator;
+        return tslib_1.__generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    processor = new writeProcessor_1.default(options);
+                    resolver = new referenceResolver_1.default();
+                    convertor = new schemaConvertor_1.default(processor, options.typeNameConvertor, options.namespaceName);
+                    if (options.contents != null) {
+                        options.contents
+                            .map(function (content) { return jsonSchema_1.parseSchema(content); })
+                            .forEach(function (schema) { return resolver.registerSchema(schema); });
+                    }
+                    if (!(options.inputUrls != null)) return [3 /*break*/, 2];
+                    return [4 /*yield*/, Promise.all(options.inputUrls.map(function (url) { return resolver.registerRemoteSchema(url); }))];
+                case 1:
+                    _a.sent();
+                    _a.label = 2;
+                case 2:
+                    generator = new dtsGenerator_1.default(resolver, convertor);
+                    return [4 /*yield*/, generator.generate()];
+                case 3: return [2 /*return*/, _a.sent()];
+            }
+        });
+    });
+}
+exports.default = dtsGenerator;
+//# sourceMappingURL=index.js.map

package/src/core/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;AAAA,wEAA0C;AAC1C,2CAA2C;AAC3C,kFAAoD;AACpD,8EAAgD;AAEhD,4EAAyE;AAEzE,uCAAiD;AAAxC,8BAAA,OAAO,CAAY;AAC5B,yDAA+D;AAAtD,uDAAA,wBAAwB,CAAA;AASjC,SAA8B,YAAY,CAAC,OAAgB;;;;;;oBACjD,SAAS,GAAG,IAAI,wBAAc,CAAC,OAAO,CAAC,CAAC;oBACxC,QAAQ,GAAG,IAAI,2BAAiB,EAAE,CAAC;oBACnC,SAAS,GAAG,IAAI,yBAAe,CAAC,SAAS,EAAE,OAAO,CAAC,iBAAiB,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC;oBAEnG,IAAI,OAAO,CAAC,QAAQ,IAAI,IAAI,EAAE;wBAC1B,OAAO,CAAC,QAAQ;6BACX,GAAG,CAAC,UAAC,OAAO,IAAK,OAAA,wBAAW,CAAC,OAAO,CAAC,EAApB,CAAoB,CAAC;6BACtC,OAAO,CAAC,UAAC,MAAM,IAAK,OAAA,QAAQ,CAAC,cAAc,CAAC,MAAM,CAAC,EAA/B,CAA+B,CAAC,CAAC;qBAC7D;yBACG,CAAA,OAAO,CAAC,SAAS,IAAI,IAAI,CAAA,EAAzB,wBAAyB;oBACzB,qBAAM,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,UAAC,GAAG,IAAK,OAAA,QAAQ,CAAC,oBAAoB,CAAC,GAAG,CAAC,EAAlC,CAAkC,CAAC,CAAC,EAAA;;oBAArF,SAAqF,CAAC;;;oBAGpF,SAAS,GAAG,IAAI,sBAAY,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;oBACjD,qBAAM,SAAS,CAAC,QAAQ,EAAE,EAAA;wBAAjC,sBAAO,SAA0B,EAAC;;;;CACrC;AAhBD,+BAgBC"}