directus-template-cli 0.5.0-beta.15 → 0.5.0-beta.17

package/dist/lib/extract/extract-assets.js

@@ -6,7 +6,6 @@ const sdk_1 = require("@directus/sdk");
 const core_1 = require("@oclif/core");
 const node_fs_1 = tslib_1.__importDefault(require("node:fs"));
 const node_path_1 = tslib_1.__importDefault(require("node:path"));
-const promises_1 = require("node:stream/promises");
 const constants_1 = require("../constants");
 const sdk_2 = require("../sdk");
 const catch_error_1 = tslib_1.__importDefault(require("../utils/catch-error"));
@@ -14,11 +13,18 @@ async function getAssetList() {
     return sdk_2.api.client.request((0, sdk_1.readFiles)({ limit: -1 }));
 }
 async function downloadFile(file, dir) {
-    const response = await sdk_2.api.client.request((0, sdk_1.readAssetRaw)(file.id));
+    const response = await sdk_2.api.client.request(() => ({
+        method: 'GET',
+        path: `/assets/${file.id}`,
+    }));
     const fullPath = node_path_1.default.join(dir, 'assets', file.filename_disk);
-    await (0, promises_1.pipeline)(
-    // @ts-ignore
-    response, node_fs_1.default.createWriteStream(fullPath));
+    if (typeof response === 'string') {
+        node_fs_1.default.writeFileSync(fullPath, response);
+    }
+    else {
+        const data = await response.arrayBuffer();
+        node_fs_1.default.writeFileSync(fullPath, Buffer.from(data));
+    }
 }
 async function downloadAllFiles(dir) {
     core_1.ux.action.start(core_1.ux.colorize(constants_1.DIRECTUS_PINK, 'Downloading assets'));

package/dist/lib/load/index.js

@@ -19,6 +19,7 @@ const load_roles_1 = tslib_1.__importDefault(require("./load-roles"));
 const load_settings_1 = tslib_1.__importDefault(require("./load-settings"));
 const load_translations_1 = tslib_1.__importDefault(require("./load-translations"));
 const load_users_1 = tslib_1.__importDefault(require("./load-users"));
+const update_required_fields_1 = tslib_1.__importDefault(require("./update-required-fields"));
 async function apply(dir, flags) {
     const source = dir + '/src';
     const isTemplateOk = await (0, check_template_1.default)(source);
@@ -45,6 +46,9 @@ async function apply(dir, flags) {
     if (flags.content) {
         await (0, load_data_1.default)(source);
     }
+    if (flags.schema) {
+        await (0, update_required_fields_1.default)(source);
+    }
     if (flags.dashboards) {
         await (0, load_dashboards_1.default)(source);
     }

package/dist/lib/load/load-collections.js

@@ -34,7 +34,14 @@ async function processCollections(collectionsToAdd, fieldsToAdd) {
     }
 }
 async function addNewCollectionWithFields(collection, allFields) {
-    const collectionFields = allFields.filter(field => field.collection === collection.collection);
+    const collectionFields = allFields.filter(field => field.collection === collection.collection)
+        .map(field => {
+        var _a;
+        if ((_a = field.meta) === null || _a === void 0 ? void 0 : _a.required) {
+            field.meta.reqiured = false;
+        }
+        return field;
+    });
     const collectionWithoutGroup = {
         ...collection,
         fields: collectionFields,

package/dist/lib/load/load-files.js

@@ -15,15 +15,9 @@ async function loadFiles(dir) {
     core_1.ux.action.start(core_1.ux.colorize(constants_1.DIRECTUS_PINK, `Loading ${files.length} files`));
     if (files && files.length > 0) {
         try {
-            const fileIds = files.map(file => file.id);
             // Fetch only the files we're interested in
             const existingFiles = await sdk_2.api.client.request((0, sdk_1.readFiles)({
                 fields: ['id', 'filename_disk'],
-                filter: {
-                    id: {
-                        _in: fileIds,
-                    },
-                },
                 limit: -1,
             }));
             const existingFileIds = new Set(existingFiles.map(file => file.id));

package/dist/lib/load/load-users.js

@@ -13,15 +13,7 @@ async function loadUsers(dir) {
     core_1.ux.action.start(core_1.ux.colorize(constants_1.DIRECTUS_PINK, `Loading ${users.length} users`));
     if (users && users.length > 0) {
         const { legacyAdminRoleId, newAdminRoleId } = await (0, get_role_ids_1.default)(dir);
-        const incomingUserEmails = users.map(user => user.email);
-        const incomingUserIds = users.map(user => user.id).filter(Boolean);
         const existingUsers = await sdk_2.api.client.request((0, sdk_1.readUsers)({
-            filter: {
-                _or: [
-                    { email: { _in: incomingUserEmails } },
-                    { id: { _in: incomingUserIds } },
-                ],
-            },
             limit: -1,
         }));
         const filteredUsers = users.map(user => {

package/dist/lib/load/update-required-fields.d.ts

@@ -0,0 +1 @@
+export default function updateRequiredFields(dir: string): Promise<void>;

package/dist/lib/load/update-required-fields.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const sdk_1 = require("@directus/sdk");
+const core_1 = require("@oclif/core");
+const constants_1 = require("../constants");
+const sdk_2 = require("../sdk");
+const catch_error_1 = tslib_1.__importDefault(require("../utils/catch-error"));
+const read_file_1 = tslib_1.__importDefault(require("../utils/read-file"));
+async function updateRequiredFields(dir) {
+    const fieldsToUpdate = (0, read_file_1.default)('fields', dir)
+        .filter(field => field.meta.required === true);
+    core_1.ux.action.start(core_1.ux.colorize(constants_1.DIRECTUS_PINK, `Updating ${fieldsToUpdate.length} fields to required`));
+    for await (const field of fieldsToUpdate) {
+        try {
+            await sdk_2.api.client.request((0, sdk_1.updateField)(field.collection, field.field, { meta: { required: true } }));
+        }
+        catch (error) {
+            (0, catch_error_1.default)(error);
+        }
+    }
+    core_1.ux.action.stop();
+}
+exports.default = updateRequiredFields;

package/oclif.manifest.json

@@ -280,5 +280,5 @@
       ]
     }
   },
-  "version": "0.5.0-beta.15"
+  "version": "0.5.0-beta.17"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "directus-template-cli",
-  "version": "0.5.0-beta.15",
+  "version": "0.5.0-beta.17",
   "description": "CLI Utility for applying templates to a Directus instance.",
   "author": "bryantgillespie @bryantgillespie",
   "bin": {