@frui.ts/generator - npm Package Compare versions

Comparing version 0.16.0-beta.10 to 0.16.0-beta.11

dist/openapi/fileGenerator.js

@@ -80,3 +80,3 @@ "use strict";
                         enumWriter = this.config.enums === "enum" ? new enumWriter_1.default(directory) : new stringLiteralWriter_1.default(directory);
-                        objectWriter = new objectEntityWriter_1.default(directory, this.params);
+                        objectWriter = new objectEntityWriter_1.default(directory, this.params, this.config);
                         unionWriter = new unionEntityWriter_1.default(directory);
@@ -83,0 +83,0 @@ progress.increment(1);

dist/openapi/models/restriction.d.ts

@@ -8,4 +8,5 @@ declare enum Restriction {
     nullable = 5,
-    readOnly = 6
+    readOnly = 6,
+    format = 7
 }
 export default Restriction;

dist/openapi/models/restriction.js

@@ -12,4 +12,5 @@ "use strict";
     Restriction[Restriction["readOnly"] = 6] = "readOnly";
+    Restriction[Restriction["format"] = 7] = "format";
 })(Restriction || (Restriction = {}));
 exports.default = Restriction;
 //# sourceMappingURL=restriction.js.map

dist/openapi/parsers/openApi2Parser.js

@@ -165,2 +165,5 @@ "use strict";
             }
+            if (definition.format) {
+                property.addRestriction(restriction_1.default.format, definition.format);
+            }
         }
@@ -167,0 +170,0 @@ return property;

dist/openapi/parsers/openApi3Parser.js

@@ -165,2 +165,5 @@ "use strict";
             }
+            if (definition.format) {
+                property.addRestriction(restriction_1.default.format, definition.format);
+            }
         }
@@ -167,0 +170,0 @@ return property;

dist/openapi/types.d.ts

@@ -18,3 +18,4 @@ import { BaseParams } from "../generatorBase";
     enums?: "enum" | "string";
+    dates?: "native" | "date-fns";
 }
 export {};

dist/openapi/writers/objectEntityWriter.d.ts

 import { CodeBlockWriter, Directory, SourceFile } from "ts-morph";
 import EntityProperty from "../models/entityProperty";
 import ObjectEntity from "../models/objectEntity";
-import { IGeneratorParams } from "../types";
+import TypeReference from "../models/typeReference";
+import { IConfig, IGeneratorParams } from "../types";
 export default class ObjectEntityWriter {
     private parentDirectory;
     private params;
-    constructor(parentDirectory: Directory, params: IGeneratorParams);
+    private config;
+    constructor(parentDirectory: Directory, params: IGeneratorParams, config: Partial<IConfig>);
     write(definition: ObjectEntity, baseClass?: ObjectEntity): SourceFile | undefined;
@@ -17,2 +19,4 @@ private updateFile;
     writePropertyDecorators(writer: CodeBlockWriter, property: EntityProperty): void;
+    getPropertyTypeConversionImports(reference: TypeReference): string[];
+    writePropertyTypeConversion(writer: CodeBlockWriter, property: EntityProperty): void;
 }

dist/openapi/writers/objectEntityWriter.js

 "use strict";
+var __values = (this && this.__values) || function(o) {
+    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
+    if (m) return m.call(o);
+    if (o && typeof o.length === "number") return {
+        next: function () {
+            if (o && i >= o.length) o = void 0;
+            return { value: o && o[i++], done: !o };
+        }
+    };
+    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
@@ -15,5 +26,6 @@ return (mod && mod.__esModule) ? mod : { "default": mod };
 var ObjectEntityWriter = (function () {
-    function ObjectEntityWriter(parentDirectory, params) {
+    function ObjectEntityWriter(parentDirectory, params, config) {
         this.parentDirectory = parentDirectory;
         this.params = params;
+        this.config = config;
     }
@@ -103,2 +115,3 @@ ObjectEntityWriter.prototype.write = function (definition, baseClass) {
     ObjectEntityWriter.prototype.getPropertyDecoratorsImports = function (properties) {
+        var e_1, _a, e_2, _b;
         var result = new Set();
@@ -109,5 +122,27 @@ if (properties.some(function (p) { var _a; return (_a = p.tags) === null || _a === void 0 ? void 0 : _a.get(observableFormatter_1.default.OBSERVABLE); })) {
         if (this.params.generateConversion) {
-            if (properties.some(function (p) { return needsTypeConversion(p.type); })) {
-                result.add("import { Type } from \"class-transformer\";");
+            try {
+                for (var properties_1 = __values(properties), properties_1_1 = properties_1.next(); !properties_1_1.done; properties_1_1 = properties_1.next()) {
+                    var property = properties_1_1.value;
+                    try {
+                        for (var _c = (e_2 = void 0, __values(this.getPropertyTypeConversionImports(property.type))), _d = _c.next(); !_d.done; _d = _c.next()) {
+                            var importStatement = _d.value;
+                            result.add(importStatement);
+                        }
+                    }
+                    catch (e_2_1) { e_2 = { error: e_2_1 }; }
+                    finally {
+                        try {
+                            if (_d && !_d.done && (_b = _c.return)) _b.call(_c);
+                        }
+                        finally { if (e_2) throw e_2.error; }
+                    }
+                }
             }
+            catch (e_1_1) { e_1 = { error: e_1_1 }; }
+            finally {
+                try {
+                    if (properties_1_1 && !properties_1_1.done && (_a = properties_1.return)) _a.call(properties_1);
+                }
+                finally { if (e_1) throw e_1.error; }
+            }
             if (properties.some(function (p) { return p.externalName; })) {
@@ -126,5 +161,3 @@ result.add("import { Expose } from \"class-transformer\";");
         if (this.params.generateConversion) {
-            if (needsTypeConversion(property.type)) {
-                writer.writeLine("@Type(() => " + property.type.getTypeName() + ")");
-            }
+            this.writePropertyTypeConversion(writer, property);
             if (property.externalName) {
@@ -135,2 +168,51 @@ writer.writeLine("@Expose({ name: \"" + property.externalName + "\" })");
     };
+    ObjectEntityWriter.prototype.getPropertyTypeConversionImports = function (reference) {
+        if (reference.type instanceof aliasEntity_1.default) {
+            return this.getPropertyTypeConversionImports(reference.type.referencedEntity);
+        }
+        var result = [];
+        if (reference.type instanceof enum_1.default) {
+            return result;
+        }
+        if (typeof reference.type === "object") {
+            result.push("import { Type } from \"class-transformer\";");
+        }
+        if (reference.type === "Date") {
+            if (this.config.dates === "date-fns") {
+                result.push("import { Transform } from \"class-transformer\";", "import formatISO from \"date-fns/formatISO\";");
+            }
+            else {
+                result.push("import { Type } from \"class-transformer\";");
+            }
+        }
+        return result;
+    };
+    ObjectEntityWriter.prototype.writePropertyTypeConversion = function (writer, property) {
+        var _a;
+        var type = property.type.type;
+        if (type instanceof aliasEntity_1.default) {
+            type = type.referencedEntity.type;
+        }
+        if (type instanceof enum_1.default) {
+            return;
+        }
+        if (typeof type === "object") {
+            writer.writeLine("@Type(() => " + property.type.getTypeName() + ")");
+        }
+        if (type === "Date") {
+            if (this.config.dates === "date-fns") {
+                writer.writeLine("@Transform(value => new Date(value), { toClassOnly: true })");
+                var format = (_a = property.restrictions) === null || _a === void 0 ? void 0 : _a.get(restriction_1.default.format);
+                if (format === "date") {
+                    writer.writeLine("@Transform(value => (value ? formatISO(value, { representation: \"date\" }) : undefined), { toPlainOnly: true })");
+                }
+                else {
+                    writer.writeLine("@Transform(value => (value ? formatISO(value) : undefined), { toPlainOnly: true })");
+                }
+            }
+            else {
+                writer.writeLine("@Type(() => Date)");
+            }
+        }
+    };
     return ObjectEntityWriter;
@@ -188,2 +270,3 @@ }());
         }
+        case restriction_1.default.format:
         case restriction_1.default.readOnly: {
@@ -196,11 +279,2 @@ return undefined;
 }
-function needsTypeConversion(reference) {
-    if (reference.type instanceof enum_1.default) {
-        return false;
-    }
-    if (reference.type instanceof aliasEntity_1.default) {
-        return needsTypeConversion(reference.type.referencedEntity);
-    }
-    return typeof reference.type === "object" || reference.type === "Date";
-}
 function needsImport(reference) {
@@ -207,0 +281,0 @@ if (reference.type instanceof aliasEntity_1.default) {

package.json

@@ -6,3 +6,3 @@ {
   },
-  "version": "0.16.0-beta.10",
+  "version": "0.16.0-beta.11",
   "description": "Frui.ts code generator",
@@ -56,3 +56,3 @@ "keywords": [
   },
-  "gitHead": "023a34d5b422cfdc7a1ec24ed82060d6f5153990"
+  "gitHead": "3df688ee37323219bd805c54f9fcb9195d42e6fa"
 }

README.md

@@ -198,2 +198,3 @@ # Frui.ts code generator
   enums?: "enum" | "string";
+  dates?: "native" | "date-fns";
 }
@@ -200,0 +201,0 @@

No alert changes

Improved metrics

Total package byte prevSize

274218

increased by2.76%

Lines of code

2976

increased by3.01%

Number of lines in readme file

271

increased by0.37%

No dependency changes