@oak-digital/types-4-strapi-2 1.0.1 → 1.0.2

package/.github/workflows/publish.yml

@@ -0,0 +1,46 @@
+name: Publish
+
+permissions:
+  contents: write
+
+on:
+  push:
+    tags:
+      - v*.*.*
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - uses: pnpm/action-setup@v2
+        name: Install pnpm
+        id: pnpm-install
+        with:
+          version: 8
+
+      - name: Install Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: 18
+          registry-url: 'https://registry.npmjs.org'
+          cache: pnpm
+
+      - name: Install dependencies
+        run: pnpm install
+
+      - name: Build
+        run: pnpm run build
+
+      - name: Publish
+        run: pnpm -r publish --access public --no-git-checks
+        env:
+          NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
+
+      - name: Create release
+        run: npx changelogithub
+        env:
+          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}

package/lib/readers/load-strapi/index.js

@@ -60,33 +60,49 @@ class LoadStrapiReader {
     loadStrapi() {
         return __awaiter(this, void 0, void 0, function* () {
             const localRemoteFile = (0, posix_1.join)(__dirname, 'remote.js');
-            const remoteRemoteFile = (0, posix_1.join)(process.cwd(), this.strapiRoot, '.t4s.remote.js');
+            // TODO: Make better check if the path is absolute or not
+            const root = this.strapiRoot.startsWith('/') ||
+                this.strapiRoot.startsWith('\\') ||
+                this.strapiRoot.startsWith('~')
+                ? ''
+                : process.cwd();
+            const remoteRemoteFile = (0, posix_1.join)(root, this.strapiRoot, '.t4s.remote.js');
+            const remoteOutputFile = (0, posix_1.join)(root, this.strapiRoot, '.t4s.contentTypes.json');
             // Plant the remote execution file in the strapi project
             yield (0, promises_1.cp)(localRemoteFile, remoteRemoteFile);
             const output = yield new Promise((resolve, reject) => {
                 const remote = (0, child_process_1.spawn)('node', [remoteRemoteFile], {
                     cwd: this.strapiRoot,
                 });
-                const data = [];
-                remote.stdout.on('data', (chunk) => {
-                    data.push(chunk);
-                });
+                const errData = [];
                 remote.stderr.on('data', (chunk) => {
-                    console.error(chunk.toString());
-                });
-                remote.on('close', () => {
-                    resolve(data.map((b) => b === null || b === void 0 ? void 0 : b.toString()).join(''));
-                });
-                remote.on('error', (err) => {
-                    reject(err);
+                    errData.push(chunk);
                 });
+                remote.on('close', (code) => __awaiter(this, void 0, void 0, function* () {
+                    if (code !== 0) {
+                        reject(new Error(`Failed to spawn remote strapi: ${errData
+                            .map((b) => { var _a; return (_a = b === null || b === void 0 ? void 0 : b.toString()) !== null && _a !== void 0 ? _a : ''; })
+                            .join('')}`));
+                        return;
+                    }
+                    try {
+                        const output = yield (0, promises_1.readFile)(remoteOutputFile);
+                        resolve(output.toString());
+                    }
+                    catch (err) {
+                        reject(err);
+                    }
+                }));
             });
+            if (output.length <= 0) {
+                throw new Error('Remote program did not return any output');
+            }
             let jsonParsed;
             try {
                 jsonParsed = JSON.parse(output);
             }
             catch (err) {
-                console.error(err, output.slice(0, 100));
+                console.error(err, output);
                 throw new Error('Failed to parse output from remote strapi');
             }
             let parsed;
@@ -98,7 +114,7 @@ class LoadStrapiReader {
                 throw new Error('Failed to parse output from remote strapi, something may be malformed');
             }
             // Remove the remote execution file after we're done
-            yield (0, promises_1.rm)(remoteRemoteFile);
+            yield Promise.all([(0, promises_1.rm)(remoteOutputFile), (0, promises_1.rm)(remoteRemoteFile)]);
             return parsed;
         });
     }

package/lib/readers/load-strapi/remote.js

@@ -9,6 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 const Strapi = require('@strapi/strapi');
+const fs = require('fs/promises');
 (() => __awaiter(this, void 0, void 0, function* () {
     const base = yield Strapi({
         distDir: 'dist',
@@ -18,7 +19,8 @@ const Strapi = require('@strapi/strapi');
     base.log.info = () => { };
     const instance = yield base.load();
     yield instance.server.mount();
-    console.log(JSON.stringify([instance.contentTypes, instance.components]));
+    // console.log(JSON.stringify([instance.contentTypes, instance.components]));
+    yield fs.writeFile('.t4s.contentTypes.json', JSON.stringify([instance.contentTypes, instance.components]));
     const dbSettings = instance.config.get('database.connection');
     //close server to release the db-file
     yield instance.server.httpServer.close();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oak-digital/types-4-strapi-2",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "Typescript interface generator for Strapi 4 models",
   "bin": {
     "t4s": "./bin/index.js"
@@ -28,6 +28,7 @@
     "@typescript-eslint/parser": "^5.33.1",
     "eslint": "^8.22.0",
     "rimraf": "^4.4.1",
+    "ts-node": "^10.9.1",
     "typescript": "^4.7.4"
   },
   "dependencies": {
@@ -41,6 +42,7 @@
     "testtypes": "node ./bin/index.js",
     "lint": "eslint src/",
     "prettier": "prettier --write \"src/**/*.ts\"",
-    "t4s": "node ./bin/index.js"
+    "t4s": "node ./bin/index.js",
+    "testdev": "ts-node ./src/index.ts"
   }
 }

package/tests/strapi-project/.editorconfig

@@ -1,16 +0,0 @@
-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

@@ -1,6 +0,0 @@
-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

@@ -1,57 +0,0 @@
-# 🚀 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

@@ -1,13 +0,0 @@
-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

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

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

@@ -1,93 +0,0 @@
-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

@@ -1,12 +0,0 @@
-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

@@ -1,10 +0,0 @@
-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),
-  },
-});