@oak-digital/types-4-strapi-2 0.1.0 → 0.1.1

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@oak-digital/types-4-strapi-2",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "Typescript interface generator for Strapi 4 models",
   "bin": {
     "t4s": "./bin/index.js"
   },
   "scripts": {
     "build": "tsc -p .",
-    "testtypes": "node ./bin/index.js --out src/testtypes",
+    "testtypes": "node ./bin/index.js",
     "t4s": "node ./bin/index.js"
   },
   "repository": {

package/src/interface/Attributes.ts

@@ -20,7 +20,7 @@ export default class Attributes {
                 break;
         }
 
-        return !attr.required;
+        return false;
     }
 
     getDependencies(strapiName: string) {
@@ -68,6 +68,13 @@ export default class Attributes {
                 break;
             case "password":
                 return null;
+            case "enumeration":
+                const hasDefault = "default" in attr;
+                const enums = attr.enum.map((en: string) => `"${en}"`)
+                enums.push("null")
+                const typeString = enums.join(" | ");
+                str += typeString;
+                break;
             case "string":
             case "text":
             case "richtext":
@@ -99,8 +106,8 @@ export default class Attributes {
         return str;
     }
 
-    toString() : string {
-        const strings = [ "{" ];
+    toFieldsString() : string {
+        const strings = [];
         for (const attrName in this.Attrs) {
             const attr = this.Attrs[attrName];
             const attrString = this.attributeToString(attrName, attr);
@@ -109,7 +116,13 @@ export default class Attributes {
             }
             strings.push(attrString)
         }
-        strings.push("  }")
+        return strings.map(s => `${s}\n`).join("");
+    }
+
+    toString() : string {
+        const strings = [ "{" ];
+        strings.push(this.toFieldsString());
+        strings.push("}")
         return strings.join("\n");
     }
 }

package/src/interface/ComponentInterface.ts

@@ -1,4 +1,3 @@
-import { prefixDotSlash } from "../utils";
 import Interface from "./Interface";
 
 export default class ComponentInterface extends Interface {
@@ -7,10 +6,22 @@ export default class ComponentInterface extends Interface {
     constructor(baseName: string, attributes: any, relativeDirectoryPath: string, category: string, prefix: string = "") {
         super(baseName, attributes, relativeDirectoryPath, prefix);
         this.Category = category;
+        // this.Attributes.id = {
+        //     type: "number", // Components have a id field with a number
+        //     required: true,
+        // };
         this.updateStrapiName();
     }
 
     updateStrapiName() {
         this.StrapiName = `${this.Category}.${this.getBaseName()}`
     }
+
+    getInterfaceFieldsString() {
+        const attrs = this.getAttributes();
+        let str = '';
+        str += `  id: number;\n`;
+        str += `  __component: "${this.getStrapiName()}";\n`
+        return str + attrs.toFieldsString();
+    }
 }

package/src/interface/Interface.ts

@@ -8,7 +8,7 @@ export default class Interface {
     private RelationNames: Record<string, [string, Interface]> = {};
     private RelationNamesCounter: Record<string, number> = {};
     private NamePrefix: string = "";
-    private Attributes: any;
+    protected Attributes: any;
     private RelativeDirectoryPath: string;
     protected StrapiName: string;
 
@@ -90,8 +90,12 @@ export default class Interface {
         }).filter(s => s).join("\n");
     }
 
+    getAttributes() : Attributes {
+        return new Attributes(this.Attributes, this.RelationNames);
+    }
+
     attributesToString() {
-        const attrs = new Attributes(this.Attributes, this.RelationNames);
+        const attrs = this.getAttributes();
         return attrs.toString();
     }