@oak-digital/types-4-strapi-2 0.5.4 → 1.0.0-beta.1

package/lib/readers/types/content-type.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.strapiContentType = void 0;
+const zod_1 = require("zod");
+const attributes_1 = require("./attributes");
+exports.strapiContentType = zod_1.z.object({
+    attributes: zod_1.z.record(attributes_1.contentTypeAttribute),
+    collectionName: zod_1.z.string(),
+    options: zod_1.z
+        .object({
+        draftAndPublish: zod_1.z.boolean().optional().default(false),
+    })
+        .optional(),
+    pluginOptions: zod_1.z.record(zod_1.z.any()).optional(),
+    uid: zod_1.z.string().optional(),
+});

package/lib/utils/casing/index.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.changeCase = exports.checkCaseType = exports.caseTypesArray = void 0;
-var change_case_1 = require("change-case");
+const change_case_1 = require("change-case");
 exports.caseTypesArray = [
     'camel',
     'capital',
@@ -16,7 +16,7 @@ function checkCaseType(caseName) {
 }
 exports.checkCaseType = checkCaseType;
 function changeCase(text, caseName) {
-    var name = text;
+    let name = text;
     switch (caseName) {
         case 'dot':
             name = (0, change_case_1.dotCase)(name);

package/lib/utils/index.js

@@ -8,51 +8,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.prefixDotSlash = exports.readDirFiltered = void 0;
-var promises_1 = require("fs/promises");
+const promises_1 = require("fs/promises");
 function readDirFiltered(dir) {
-    return __awaiter(this, void 0, void 0, function () {
-        var folders;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0: return [4 /*yield*/, (0, promises_1.readdir)(dir)];
-                case 1:
-                    folders = _a.sent();
-                    return [2 /*return*/, folders.filter(function (folder) { return !folder.startsWith('.'); })];
-            }
-        });
+    return __awaiter(this, void 0, void 0, function* () {
+        const folders = yield (0, promises_1.readdir)(dir);
+        return folders.filter((folder) => !folder.startsWith('.'));
     });
 }
 exports.readDirFiltered = readDirFiltered;
 function prefixDotSlash(path) {
-    return (/^\.?\.\//).test(path) ? path : './' + path;
+    return /^\.?\.\//.test(path) ? path : './' + path;
 }
 exports.prefixDotSlash = prefixDotSlash;

package/lib/writers/basic-writer.d.ts

@@ -0,0 +1,24 @@
+import { File } from '../file/File';
+import { InterfaceWriter } from './types/writer';
+import prettier from 'prettier';
+declare type BasicWriterOptions = {
+    /**
+     * Warning: this will delete all files in the output directory!
+     * @default false
+     * @type {boolean}
+     */
+    deleteOld?: boolean;
+    prettierOptions?: prettier.Options;
+    indexFile?: boolean;
+};
+export declare class BasicWriter implements InterfaceWriter {
+    protected OutRootPath: string;
+    private DeleteOld;
+    private PrettierOptions;
+    private IndexFile;
+    constructor(outRootPath: string, { deleteOld, indexFile, prettierOptions, }: BasicWriterOptions);
+    write(data: File[]): Promise<void>;
+    writeIndexFile(data: File[]): Promise<void>;
+    makeFolders(data: File[]): Promise<void>;
+}
+export {};

package/lib/writers/basic-writer.js

@@ -0,0 +1,75 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BasicWriter = void 0;
+const promises_1 = require("fs/promises");
+const posix_1 = require("path/posix");
+const prettier_1 = __importDefault(require("prettier"));
+class BasicWriter {
+    constructor(outRootPath, { deleteOld = false, indexFile = true, prettierOptions = { parser: 'typescript' }, }) {
+        this.OutRootPath = outRootPath;
+        this.DeleteOld = deleteOld;
+        this.IndexFile = indexFile;
+        this.PrettierOptions = prettierOptions;
+    }
+    write(data) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.DeleteOld) {
+                yield (0, promises_1.rm)(this.OutRootPath, { recursive: true, force: true });
+            }
+            // make folders
+            yield this.makeFolders(data);
+            // write files
+            const promises = data.map((file) => __awaiter(this, void 0, void 0, function* () {
+                const fileData = file.toString();
+                const formattedFileData = prettier_1.default.format(fileData, this.PrettierOptions);
+                const filePath = (0, posix_1.join)(this.OutRootPath, file.getRelativeRootPathFile());
+                yield (0, promises_1.mkdir)((0, posix_1.dirname)(filePath), {
+                    recursive: true,
+                });
+                yield (0, promises_1.writeFile)(filePath, formattedFileData);
+            }));
+            if (this.IndexFile) {
+                yield this.writeIndexFile(data);
+            }
+            yield Promise.all(promises);
+        });
+    }
+    writeIndexFile(data) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const strings = data.map((inter) => {
+                return `export * from '${inter.getRelativeRootPath()}'`;
+            });
+            const fileData = strings.join('\n');
+            const formattedFileData = prettier_1.default.format(fileData, this.PrettierOptions);
+            const filePath = (0, posix_1.join)(this.OutRootPath, 'index.ts');
+            yield (0, promises_1.writeFile)(filePath, formattedFileData);
+        });
+    }
+    makeFolders(data) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const folderPaths = new Set();
+            data.map((file) => {
+                const filePath = (0, posix_1.join)(this.OutRootPath, file.getRelativeRootPathFile());
+                const folderPath = (0, posix_1.dirname)(filePath);
+                folderPaths.add(folderPath);
+            });
+            const promises = Array.from(folderPaths).map((folderPath) => {
+                return (0, promises_1.mkdir)(folderPath, { recursive: true });
+            });
+            yield Promise.all(promises);
+        });
+    }
+}
+exports.BasicWriter = BasicWriter;

package/lib/writers/types/writer.d.ts

@@ -0,0 +1,4 @@
+import { File } from '../../file/File';
+export interface InterfaceWriter {
+    write(data: File[]): Promise<void>;
+}

package/lib/writers/types/writer.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/package.json

@@ -1,16 +1,10 @@
 {
   "name": "@oak-digital/types-4-strapi-2",
-  "version": "0.5.4",
+  "version": "1.0.0-beta.1",
   "description": "Typescript interface generator for Strapi 4 models",
   "bin": {
     "t4s": "./bin/index.js"
   },
-  "scripts": {
-    "build": "tsc -p .",
-    "testtypes": "node ./bin/index.js",
-    "lint": "eslint src/",
-    "t4s": "node ./bin/index.js"
-  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/Oak-Digital/types-4-strapi-2.git"
@@ -33,11 +27,20 @@
     "@typescript-eslint/eslint-plugin": "^5.33.1",
     "@typescript-eslint/parser": "^5.33.1",
     "eslint": "^8.22.0",
+    "rimraf": "^4.4.1",
     "typescript": "^4.7.4"
   },
   "dependencies": {
     "change-case": "^4.1.2",
     "commander": "^9.4.0",
-    "prettier": "^2.7.1"
+    "prettier": "^2.7.1",
+    "zod": "^3.21.4"
+  },
+  "scripts": {
+    "build": "rimraf lib && tsc -p .",
+    "testtypes": "node ./bin/index.js",
+    "lint": "eslint src/",
+    "prettier": "prettier --write \"src/**/*.ts\"",
+    "t4s": "node ./bin/index.js"
   }
-}
+}

package/tests/strapi-project/.editorconfig

@@ -0,0 +1,16 @@
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[{package.json,*.yml}]
+indent_style = space
+indent_size = 2
+
+[*.md]
+trim_trailing_whitespace = false

package/tests/strapi-project/.env.example

@@ -0,0 +1,6 @@
+HOST=0.0.0.0
+PORT=1337
+APP_KEYS="toBeModified1,toBeModified2"
+API_TOKEN_SALT=tobemodified
+ADMIN_JWT_SECRET=tobemodified
+JWT_SECRET=tobemodified

package/tests/strapi-project/README.md

@@ -0,0 +1,57 @@
+# 🚀 Getting started with Strapi
+
+Strapi comes with a full featured [Command Line Interface](https://docs.strapi.io/developer-docs/latest/developer-resources/cli/CLI.html) (CLI) which lets you scaffold and manage your project in seconds.
+
+### `develop`
+
+Start your Strapi application with autoReload enabled. [Learn more](https://docs.strapi.io/developer-docs/latest/developer-resources/cli/CLI.html#strapi-develop)
+
+```
+npm run develop
+# or
+yarn develop
+```
+
+### `start`
+
+Start your Strapi application with autoReload disabled. [Learn more](https://docs.strapi.io/developer-docs/latest/developer-resources/cli/CLI.html#strapi-start)
+
+```
+npm run start
+# or
+yarn start
+```
+
+### `build`
+
+Build your admin panel. [Learn more](https://docs.strapi.io/developer-docs/latest/developer-resources/cli/CLI.html#strapi-build)
+
+```
+npm run build
+# or
+yarn build
+```
+
+## ⚙️ Deployment
+
+Strapi gives you many possible deployment options for your project. Find the one that suits you on the [deployment section of the documentation](https://docs.strapi.io/developer-docs/latest/setup-deployment-guides/deployment.html).
+
+## 📚 Learn more
+
+- [Resource center](https://strapi.io/resource-center) - Strapi resource center.
+- [Strapi documentation](https://docs.strapi.io) - Official Strapi documentation.
+- [Strapi tutorials](https://strapi.io/tutorials) - List of tutorials made by the core team and the community.
+- [Strapi blog](https://docs.strapi.io) - Official Strapi blog containing articles made by the Strapi team and the community.
+- [Changelog](https://strapi.io/changelog) - Find out about the Strapi product updates, new features and general improvements.
+
+Feel free to check out the [Strapi GitHub repository](https://github.com/strapi/strapi). Your feedback and contributions are welcome!
+
+## ✨ Community
+
+- [Discord](https://discord.strapi.io) - Come chat with the Strapi community including the core team.
+- [Forum](https://forum.strapi.io/) - Place to discuss, ask questions and find answers, show your Strapi project and get feedback or just talk with other Community members.
+- [Awesome Strapi](https://github.com/strapi/awesome-strapi) - A curated list of awesome things related to Strapi.
+
+---
+
+<sub>🤫 Psst! [Strapi is hiring](https://strapi.io/careers).</sub>

package/tests/strapi-project/config/admin.ts

@@ -0,0 +1,13 @@
+export default ({ env }) => ({
+  auth: {
+    secret: env('ADMIN_JWT_SECRET'),
+  },
+  apiToken: {
+    salt: env('API_TOKEN_SALT'),
+  },
+  transfer: {
+    token: {
+      salt: env('TRANSFER_TOKEN_SALT'),
+    },
+  },
+});

package/tests/strapi-project/config/api.ts

@@ -0,0 +1,7 @@
+export default {
+  rest: {
+    defaultLimit: 25,
+    maxLimit: 100,
+    withCount: true,
+  },
+};

package/tests/strapi-project/config/database.ts

@@ -0,0 +1,93 @@
+import path from 'path';
+
+export default ({ env }) => {
+  const client = env('DATABASE_CLIENT', 'sqlite');
+
+  const connections = {
+    mysql: {
+      connection: {
+        connectionString: env('DATABASE_URL'),
+        host: env('DATABASE_HOST', 'localhost'),
+        port: env.int('DATABASE_PORT', 3306),
+        database: env('DATABASE_NAME', 'strapi'),
+        user: env('DATABASE_USERNAME', 'strapi'),
+        password: env('DATABASE_PASSWORD', 'strapi'),
+        ssl: env.bool('DATABASE_SSL', false) && {
+          key: env('DATABASE_SSL_KEY', undefined),
+          cert: env('DATABASE_SSL_CERT', undefined),
+          ca: env('DATABASE_SSL_CA', undefined),
+          capath: env('DATABASE_SSL_CAPATH', undefined),
+          cipher: env('DATABASE_SSL_CIPHER', undefined),
+          rejectUnauthorized: env.bool(
+            'DATABASE_SSL_REJECT_UNAUTHORIZED',
+            true
+          ),
+        },
+      },
+      pool: { min: env.int('DATABASE_POOL_MIN', 2), max: env.int('DATABASE_POOL_MAX', 10) },
+    },
+    mysql2: {
+      connection: {
+        host: env('DATABASE_HOST', 'localhost'),
+        port: env.int('DATABASE_PORT', 3306),
+        database: env('DATABASE_NAME', 'strapi'),
+        user: env('DATABASE_USERNAME', 'strapi'),
+        password: env('DATABASE_PASSWORD', 'strapi'),
+        ssl: env.bool('DATABASE_SSL', false) && {
+          key: env('DATABASE_SSL_KEY', undefined),
+          cert: env('DATABASE_SSL_CERT', undefined),
+          ca: env('DATABASE_SSL_CA', undefined),
+          capath: env('DATABASE_SSL_CAPATH', undefined),
+          cipher: env('DATABASE_SSL_CIPHER', undefined),
+          rejectUnauthorized: env.bool(
+            'DATABASE_SSL_REJECT_UNAUTHORIZED',
+            true
+          ),
+        },
+      },
+      pool: { min: env.int('DATABASE_POOL_MIN', 2), max: env.int('DATABASE_POOL_MAX', 10) },
+    },
+    postgres: {
+      connection: {
+        connectionString: env('DATABASE_URL'),
+        host: env('DATABASE_HOST', 'localhost'),
+        port: env.int('DATABASE_PORT', 5432),
+        database: env('DATABASE_NAME', 'strapi'),
+        user: env('DATABASE_USERNAME', 'strapi'),
+        password: env('DATABASE_PASSWORD', 'strapi'),
+        ssl: env.bool('DATABASE_SSL', false) && {
+          key: env('DATABASE_SSL_KEY', undefined),
+          cert: env('DATABASE_SSL_CERT', undefined),
+          ca: env('DATABASE_SSL_CA', undefined),
+          capath: env('DATABASE_SSL_CAPATH', undefined),
+          cipher: env('DATABASE_SSL_CIPHER', undefined),
+          rejectUnauthorized: env.bool(
+            'DATABASE_SSL_REJECT_UNAUTHORIZED',
+            true
+          ),
+        },
+        schema: env('DATABASE_SCHEMA', 'public'),
+      },
+      pool: { min: env.int('DATABASE_POOL_MIN', 2), max: env.int('DATABASE_POOL_MAX', 10) },
+    },
+    sqlite: {
+      connection: {
+        filename: path.join(
+          __dirname,
+          '..',
+          '..',
+          env('DATABASE_FILENAME', 'data.db')
+        ),
+      },
+      useNullAsDefault: true,
+    },
+  };
+
+  return {
+    connection: {
+      client,
+      ...connections[client],
+      acquireConnectionTimeout: env.int('DATABASE_CONNECTION_TIMEOUT', 60000),
+    },
+  };
+};

package/tests/strapi-project/config/middlewares.ts

@@ -0,0 +1,12 @@
+export default [
+  'strapi::errors',
+  'strapi::security',
+  'strapi::cors',
+  'strapi::poweredBy',
+  'strapi::logger',
+  'strapi::query',
+  'strapi::body',
+  'strapi::session',
+  'strapi::favicon',
+  'strapi::public',
+];

package/tests/strapi-project/config/server.ts

@@ -0,0 +1,10 @@
+export default ({ env }) => ({
+  host: env('HOST', '0.0.0.0'),
+  port: env.int('PORT', 1337),
+  app: {
+    keys: env.array('APP_KEYS'),
+  },
+  webhooks: {
+    populateRelations: env.bool('WEBHOOKS_POPULATE_RELATIONS', false),
+  },
+});