auth0-deploy-cli 7.10.0 → 7.11.0

package/CHANGELOG.md

@@ -7,6 +7,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [7.11.0] - 2022-04-28
+
+### Added
+
+- Intelligent scope detection, will skip resources when insufficient scope provided to designated application [#517]
+
+### Fixed
+
+- Inconsistencies between resource handlers with respect to empty, null and undefined values [#512]
+
 ## [7.10.0] - 2022-04-26
 
 ### Added
@@ -702,7 +712,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 [#504]: https://github.com/auth0/auth0-deploy-cli/issues/504
 [#505]: https://github.com/auth0/auth0-deploy-cli/issues/505
 [#509]: https://github.com/auth0/auth0-deploy-cli/issues/509
-[unreleased]: https://github.com/auth0/auth0-deploy-cli/compare/v7.10.0...HEAD
+[#512]: https://github.com/auth0/auth0-deploy-cli/issues/512
+[#517]: https://github.com/auth0/auth0-deploy-cli/issues/517
+[unreleased]: https://github.com/auth0/auth0-deploy-cli/compare/v7.11.0...HEAD
+[7.11.0]: https://github.com/auth0/auth0-deploy-cli/compare/v7.10.0...v7.11.0
 [7.10.0]: https://github.com/auth0/auth0-deploy-cli/compare/v7.9.0...v7.10.0
 [7.9.0]: https://github.com/auth0/auth0-deploy-cli/compare/v7.8.0...v7.9.0
 [7.8.0]: https://github.com/auth0/auth0-deploy-cli/compare/v7.7.1...v7.8.0

package/lib/context/directory/handlers/actions.d.ts

@@ -1,6 +1,5 @@
 import { DirectoryHandler } from '.';
-declare type ParsedActions = {
-    actions: unknown[] | undefined;
-};
+import { Asset, ParsedAsset } from '../../../types';
+declare type ParsedActions = ParsedAsset<'actions', Asset[]>;
 declare const actionsHandler: DirectoryHandler<ParsedActions>;
 export default actionsHandler;

package/lib/context/directory/handlers/actions.js

@@ -21,7 +21,7 @@ const logger_1 = __importDefault(require("../../../logger"));
 function parse(context) {
     const actionsFolder = path_1.default.join(context.filePath, tools_1.constants.ACTIONS_DIRECTORY);
     if (!(0, utils_1.existsMustBeDir)(actionsFolder))
-        return { actions: undefined }; // Skip
+        return { actions: null }; // Skip
     const files = (0, utils_1.getFiles)(actionsFolder, ['.json']);
     const actions = files.map((file) => {
         const action = Object.assign({}, (0, utils_1.loadJSON)(file, context.mappings));
@@ -60,7 +60,7 @@ function mapToAction(filePath, action) {
         code: mapActionCode(filePath, action),
         runtime: action.runtime,
         status: action.status,
-        dependencies: action.dependencies || [],
+        dependencies: action.dependencies,
         secrets: mapSecrets(action.secrets),
         supported_triggers: action.supported_triggers,
         deployed: action.deployed || action.all_changes_deployed,
@@ -68,8 +68,8 @@ function mapToAction(filePath, action) {
 }
 function dump(context) {
     return __awaiter(this, void 0, void 0, function* () {
-        const actions = [...(context.assets.actions || [])];
-        if (actions.length < 1)
+        const { actions } = context.assets;
+        if (!actions)
             return;
         // Create Actions folder
         const actionsFolder = path_1.default.join(context.filePath, tools_1.constants.ACTIONS_DIRECTORY);

package/lib/context/directory/handlers/attackProtection.d.ts

@@ -1,10 +1,9 @@
 import { DirectoryHandler } from '.';
-declare type ParsedAttackProtection = {
-    attackProtection: {
-        breachedPasswordDetection: unknown;
-        bruteForceProtection: unknown;
-        suspiciousIpThrottling: unknown;
-    } | undefined;
-};
+import { Asset, ParsedAsset } from '../../../types';
+declare type ParsedAttackProtection = ParsedAsset<'attackProtection', {
+    breachedPasswordDetection: Asset;
+    bruteForceProtection: Asset;
+    suspiciousIpThrottling: Asset;
+}>;
 declare const attackProtectionHandler: DirectoryHandler<ParsedAttackProtection>;
 export default attackProtectionHandler;

package/lib/context/directory/handlers/attackProtection.js

@@ -29,7 +29,7 @@ function parse(context) {
     const files = attackProtectionFiles(context.filePath);
     if (!(0, utils_1.existsMustBeDir)(files.directory)) {
         return {
-            attackProtection: undefined,
+            attackProtection: null,
         };
     }
     const breachedPasswordDetection = (0, utils_1.loadJSON)(files.breachedPasswordDetection, context.mappings);
@@ -46,6 +46,8 @@ function parse(context) {
 function dump(context) {
     return __awaiter(this, void 0, void 0, function* () {
         const { attackProtection } = context.assets;
+        if (!attackProtection)
+            return;
         const files = attackProtectionFiles(context.filePath);
         fs_extra_1.default.ensureDirSync(files.directory);
         (0, utils_1.dumpJSON)(files.breachedPasswordDetection, attackProtection.breachedPasswordDetection);

package/lib/context/directory/handlers/branding.d.ts

@@ -1,6 +1,5 @@
 import { DirectoryHandler } from '.';
-declare type ParsedBranding = {
-    branding: unknown | undefined;
-};
+import { Asset, ParsedAsset } from '../../../types';
+declare type ParsedBranding = ParsedAsset<'branding', Asset>;
 declare const brandingHandler: DirectoryHandler<ParsedBranding>;
 export default brandingHandler;

package/lib/context/directory/handlers/branding.js

@@ -8,17 +8,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -30,11 +19,11 @@ const utils_1 = require("../../../utils");
 function parse(context) {
     const brandingDirectory = path_1.default.join(context.filePath, tools_1.constants.BRANDING_DIRECTORY);
     if (!(0, utils_1.existsMustBeDir)(brandingDirectory))
-        return { branding: undefined };
+        return { branding: null };
     const branding = (0, utils_1.loadJSON)(path_1.default.join(brandingDirectory, 'branding.json'), context.mappings);
     const brandingTemplatesFolder = path_1.default.join(brandingDirectory, tools_1.constants.BRANDING_TEMPLATES_DIRECTORY);
     if (!(0, utils_1.existsMustBeDir)(brandingTemplatesFolder))
-        return { branding: context.assets.branding };
+        return { branding: null };
     const templatesDefinitionFiles = (0, utils_1.getFiles)(brandingTemplatesFolder, ['.json']);
     const templates = templatesDefinitionFiles.map((templateDefinitionFile) => {
         const definition = (0, utils_1.loadJSON)(templateDefinitionFile, context.mappings);
@@ -47,15 +36,16 @@ function parse(context) {
 }
 function dump(context) {
     return __awaiter(this, void 0, void 0, function* () {
-        const _a = context.assets.branding, { templates = [] } = _a, branding = __rest(_a, ["templates"]);
-        if (!!branding)
-            dumpBranding(context);
-        if (!!templates)
+        const { branding } = context.assets;
+        if (!branding)
+            return;
+        dumpBranding(context);
+        if (!!branding.templates)
             dumpBrandingTemplates(context);
     });
 }
 const dumpBrandingTemplates = ({ filePath, assets }) => {
-    if (!assets || !assets.branding)
+    if (!assets.branding || !assets.branding.templates)
         return;
     const { branding: { templates = [] }, } = assets;
     const brandingTemplatesFolder = path_1.default.join(filePath, tools_1.constants.BRANDING_DIRECTORY, tools_1.constants.BRANDING_TEMPLATES_DIRECTORY);

package/lib/context/directory/handlers/clientGrants.d.ts

@@ -1,6 +1,5 @@
 import { DirectoryHandler } from '.';
-declare type ParsedClientGrants = {
-    clientGrants: unknown[] | undefined;
-};
+import { Asset, ParsedAsset } from '../../../types';
+declare type ParsedClientGrants = ParsedAsset<'clientGrants', Asset[]>;
 declare const clientGrantsHandler: DirectoryHandler<ParsedClientGrants>;
 export default clientGrantsHandler;

package/lib/context/directory/handlers/clientGrants.js

@@ -19,7 +19,7 @@ const utils_1 = require("../../../utils");
 function parse(context) {
     const grantsFolder = path_1.default.join(context.filePath, tools_1.constants.CLIENTS_GRANTS_DIRECTORY);
     if (!(0, utils_1.existsMustBeDir)(grantsFolder))
-        return { clientGrants: undefined }; // Skip
+        return { clientGrants: null }; // Skip
     const foundFiles = (0, utils_1.getFiles)(grantsFolder, ['.json']);
     const clientGrants = foundFiles
         .map((f) => (0, utils_1.loadJSON)(f, context.mappings))
@@ -38,7 +38,8 @@ function dump(context) {
         // Convert client_id to the client name for readability
         clientGrants.forEach((grant) => {
             const dumpGrant = Object.assign({}, grant);
-            dumpGrant.client_id = (0, utils_1.convertClientIdToName)(dumpGrant.client_id, context.assets.clientsOrig);
+            if (context.assets.clientsOrig)
+                dumpGrant.client_id = (0, utils_1.convertClientIdToName)(dumpGrant.client_id, context.assets.clientsOrig);
             const name = (0, utils_1.sanitize)(`${dumpGrant.client_id} (${dumpGrant.audience})`);
             const grantFile = path_1.default.join(grantsFolder, `${name}.json`);
             (0, utils_1.dumpJSON)(grantFile, dumpGrant);

package/lib/context/directory/handlers/clients.d.ts

@@ -1,6 +1,5 @@
+import { Asset, ParsedAsset } from '../../../types';
 import { DirectoryHandler } from '.';
-declare type ParsedClients = {
-    clients: unknown | undefined;
-};
+declare type ParsedClients = ParsedAsset<'clients', Asset[]>;
 declare const clientsHandler: DirectoryHandler<ParsedClients>;
 export default clientsHandler;

package/lib/context/directory/handlers/clients.js

@@ -20,7 +20,7 @@ const utils_1 = require("../../../utils");
 function parse(context) {
     const clientsFolder = path_1.default.join(context.filePath, tools_1.constants.CLIENTS_DIRECTORY);
     if (!(0, utils_1.existsMustBeDir)(clientsFolder))
-        return { clients: undefined }; // Skip
+        return { clients: null }; // Skip
     const foundFiles = (0, utils_1.getFiles)(clientsFolder, ['.json']);
     const clients = foundFiles
         .map((f) => {

package/lib/context/directory/handlers/connections.d.ts

@@ -1,6 +1,5 @@
 import { DirectoryHandler } from '.';
-declare type ParsedConnections = {
-    connections: unknown[] | undefined;
-};
+import { Asset, ParsedAsset } from '../../../types';
+declare type ParsedConnections = ParsedAsset<'connections', Asset[]>;
 declare const connectionsHandler: DirectoryHandler<ParsedConnections>;
 export default connectionsHandler;

package/lib/context/directory/handlers/connections.js

@@ -21,7 +21,7 @@ function parse(context) {
     const connectionDirectory = context.config.AUTH0_CONNECTIONS_DIRECTORY || tools_1.constants.CONNECTIONS_DIRECTORY;
     const connectionsFolder = path_1.default.join(context.filePath, connectionDirectory);
     if (!(0, utils_1.existsMustBeDir)(connectionsFolder))
-        return { connections: undefined }; // Skip
+        return { connections: null }; // Skip
     const foundFiles = (0, utils_1.getFiles)(connectionsFolder, ['.json']);
     const connections = foundFiles
         .map((f) => {
@@ -42,7 +42,7 @@ function parse(context) {
 }
 function dump(context) {
     return __awaiter(this, void 0, void 0, function* () {
-        const { connections } = context.assets;
+        const { connections, clientsOrig } = context.assets;
         if (!connections)
             return; // Skip, nothing to dump
         const connectionsFolder = path_1.default.join(context.filePath, tools_1.constants.CONNECTIONS_DIRECTORY);
@@ -50,7 +50,7 @@ function dump(context) {
         // Convert enabled_clients from id to name
         connections.forEach((connection) => {
             const dumpedConnection = Object.assign(Object.assign({}, connection), (connection.enabled_clients && {
-                enabled_clients: (0, utils_1.mapClientID2NameSorted)(connection.enabled_clients, context.assets.clientsOrig),
+                enabled_clients: (0, utils_1.mapClientID2NameSorted)(connection.enabled_clients, clientsOrig || []),
             }));
             const connectionName = (0, utils_1.sanitize)(dumpedConnection.name);
             if (dumpedConnection.strategy === 'email') {

package/lib/context/directory/handlers/databases.d.ts

@@ -1,6 +1,5 @@
 import { DirectoryHandler } from '.';
-declare type ParsedDatabases = {
-    databases: unknown[] | undefined;
-};
+import { Asset, ParsedAsset } from '../../../types';
+declare type ParsedDatabases = ParsedAsset<'databases', Asset[]>;
 declare const databasesHandler: DirectoryHandler<ParsedDatabases>;
 export default databasesHandler;

package/lib/context/directory/handlers/databases.js

@@ -52,7 +52,7 @@ function getDatabase(folder, mappings) {
 function parse(context) {
     const databaseFolder = path_1.default.join(context.filePath, tools_1.constants.DATABASE_CONNECTIONS_DIRECTORY);
     if (!(0, utils_1.existsMustBeDir)(databaseFolder))
-        return { databases: undefined }; // Skip
+        return { databases: null }; // Skip
     const folders = fs_extra_1.default
         .readdirSync(databaseFolder)
         .map((f) => path_1.default.join(databaseFolder, f))
@@ -80,7 +80,7 @@ function dump(context) {
                 return name1 > name2 ? 1 : -1;
             };
             const formatted = Object.assign(Object.assign(Object.assign({}, database), (database.enabled_clients && {
-                enabled_clients: (0, utils_1.mapClientID2NameSorted)(database.enabled_clients, context.assets.clientsOrig),
+                enabled_clients: (0, utils_1.mapClientID2NameSorted)(database.enabled_clients, context.assets.clientsOrig || []),
             })), { options: Object.assign(Object.assign({}, database.options), (database.options.customScripts && {
                     customScripts: Object.entries(database.options.customScripts)
                         //@ts-ignore

package/lib/context/directory/handlers/emailProvider.d.ts

@@ -1,6 +1,5 @@
 import { DirectoryHandler } from '.';
-declare type ParsedEmailProvider = {
-    emailProvider: unknown;
-} | {};
+import { Asset, ParsedAsset } from '../../../types';
+declare type ParsedEmailProvider = ParsedAsset<'emailProvider', Asset>;
 declare const emailProviderHandler: DirectoryHandler<ParsedEmailProvider>;
 export default emailProviderHandler;

package/lib/context/directory/handlers/emailProvider.js

@@ -20,26 +20,28 @@ const defaults_1 = require("../../defaults");
 function parse(context) {
     const emailsFolder = path_1.default.join(context.filePath, tools_1.constants.EMAIL_TEMPLATES_DIRECTORY);
     if (!(0, utils_1.existsMustBeDir)(emailsFolder))
-        return {}; // Skip
+        return { emailProvider: null }; // Skip
     const providerFile = path_1.default.join(emailsFolder, 'provider.json');
     if ((0, utils_1.isFile)(providerFile)) {
         return {
             emailProvider: (0, utils_1.loadJSON)(providerFile, context.mappings),
         };
     }
-    return {};
+    return { emailProvider: null };
 }
 function dump(context) {
-    var _a;
     return __awaiter(this, void 0, void 0, function* () {
-        let { emailProvider } = context.assets;
-        if (!emailProvider)
+        if (!context.assets.emailProvider)
             return; // Skip, nothing to dump
-        const excludedDefaults = ((_a = context.assets.exclude) === null || _a === void 0 ? void 0 : _a.defaults) || [];
-        if (!excludedDefaults.includes('emailProvider')) {
-            // Add placeholder for credentials as they cannot be exported
-            emailProvider = (0, defaults_1.emailProviderDefaults)(emailProvider);
-        }
+        const emailProvider = (() => {
+            var _a;
+            const excludedDefaults = ((_a = context.assets.exclude) === null || _a === void 0 ? void 0 : _a.defaults) || [];
+            if (!excludedDefaults.includes('emailProvider')) {
+                // Add placeholder for credentials as they cannot be exported
+                return (0, defaults_1.emailProviderDefaults)(context.assets.emailProvider);
+            }
+            return context.assets.emailProvider;
+        })();
         const emailsFolder = path_1.default.join(context.filePath, tools_1.constants.EMAIL_TEMPLATES_DIRECTORY);
         fs_extra_1.default.ensureDirSync(emailsFolder);
         const emailProviderFile = path_1.default.join(emailsFolder, 'provider.json');

package/lib/context/directory/handlers/emailTemplates.d.ts

@@ -1,6 +1,5 @@
 import { DirectoryHandler } from '.';
-declare type ParsedEmailTemplates = {
-    emailTemplates: unknown | undefined;
-};
+import { Asset, ParsedAsset } from '../../../types';
+declare type ParsedEmailTemplates = ParsedAsset<'emailTemplates', Asset[]>;
 declare const emailTemplatesHandler: DirectoryHandler<ParsedEmailTemplates>;
 export default emailTemplatesHandler;

package/lib/context/directory/handlers/emailTemplates.js

@@ -20,7 +20,7 @@ const utils_1 = require("../../../utils");
 function parse(context) {
     const emailsFolder = path_1.default.join(context.filePath, tools_1.constants.EMAIL_TEMPLATES_DIRECTORY);
     if (!(0, utils_1.existsMustBeDir)(emailsFolder))
-        return { emailTemplates: undefined }; // Skip
+        return { emailTemplates: null }; // Skip
     const files = (0, utils_1.getFiles)(emailsFolder, ['.json', '.html']).filter((f) => path_1.default.basename(f) !== 'provider.json');
     const sorted = {};
     files.forEach((file) => {
@@ -51,7 +51,7 @@ function parse(context) {
 }
 function dump(context) {
     return __awaiter(this, void 0, void 0, function* () {
-        const emailTemplates = [...(context.assets.emailTemplates || [])];
+        const emailTemplates = context.assets.emailTemplates;
         if (!emailTemplates)
             return; // Skip, nothing to dump
         // Create Templates folder

package/lib/context/directory/handlers/guardianFactorProviders.d.ts

@@ -1,6 +1,5 @@
 import { DirectoryHandler } from '.';
-declare type ParsedGuardianFactorProviders = {
-    guardianFactorProviders: unknown[] | undefined;
-};
+import { Asset, ParsedAsset } from '../../../types';
+declare type ParsedGuardianFactorProviders = ParsedAsset<'guardianFactorProviders', Asset[]>;
 declare const guardianFactorProvidersHandler: DirectoryHandler<ParsedGuardianFactorProviders>;
 export default guardianFactorProvidersHandler;

package/lib/context/directory/handlers/guardianFactorProviders.js

@@ -19,7 +19,7 @@ const utils_1 = require("../../../utils");
 function parse(context) {
     const factorProvidersFolder = path_1.default.join(context.filePath, tools_1.constants.GUARDIAN_DIRECTORY, tools_1.constants.GUARDIAN_PROVIDERS_DIRECTORY);
     if (!(0, utils_1.existsMustBeDir)(factorProvidersFolder))
-        return { guardianFactorProviders: undefined }; // Skip
+        return { guardianFactorProviders: null }; // Skip
     const foundFiles = (0, utils_1.getFiles)(factorProvidersFolder, ['.json']);
     const guardianFactorProviders = foundFiles
         .map((f) => (0, utils_1.loadJSON)(f, context.mappings))

package/lib/context/directory/handlers/guardianFactorTemplates.d.ts

@@ -1,6 +1,5 @@
 import { DirectoryHandler } from '.';
-declare type ParsedGuardianFactorTemplates = {
-    guardianFactorTemplates: unknown[] | undefined;
-};
+import { Asset, ParsedAsset } from '../../../types';
+declare type ParsedGuardianFactorTemplates = ParsedAsset<'guardianFactorTemplates', Asset[]>;
 declare const guardianFactorTemplatesHandler: DirectoryHandler<ParsedGuardianFactorTemplates>;
 export default guardianFactorTemplatesHandler;

package/lib/context/directory/handlers/guardianFactorTemplates.js

@@ -19,7 +19,7 @@ const utils_1 = require("../../../utils");
 function parse(context) {
     const factorTemplatesFolder = path_1.default.join(context.filePath, tools_1.constants.GUARDIAN_DIRECTORY, tools_1.constants.GUARDIAN_TEMPLATES_DIRECTORY);
     if (!(0, utils_1.existsMustBeDir)(factorTemplatesFolder))
-        return { guardianFactorTemplates: undefined }; // Skip
+        return { guardianFactorTemplates: null }; // Skip
     const foundFiles = (0, utils_1.getFiles)(factorTemplatesFolder, ['.json']);
     const guardianFactorTemplates = foundFiles
         .map((f) => (0, utils_1.loadJSON)(f, context.mappings))

package/lib/context/directory/handlers/guardianFactors.d.ts

@@ -1,6 +1,5 @@
 import { DirectoryHandler } from '.';
-declare type ParsedGuardianFactors = {
-    guardianFactors: unknown[] | undefined;
-};
+import { Asset, ParsedAsset } from '../../../types';
+declare type ParsedGuardianFactors = ParsedAsset<'guardianFactors', Asset[]>;
 declare const guardianFactorsHandler: DirectoryHandler<ParsedGuardianFactors>;
 export default guardianFactorsHandler;

package/lib/context/directory/handlers/guardianFactors.js

@@ -19,7 +19,7 @@ const utils_1 = require("../../../utils");
 function parse(context) {
     const factorsFolder = path_1.default.join(context.filePath, tools_1.constants.GUARDIAN_DIRECTORY, tools_1.constants.GUARDIAN_FACTORS_DIRECTORY);
     if (!(0, utils_1.existsMustBeDir)(factorsFolder))
-        return { guardianFactors: undefined }; // Skip
+        return { guardianFactors: null }; // Skip
     const foundFiles = (0, utils_1.getFiles)(factorsFolder, ['.json']);
     const guardianFactors = foundFiles
         .map((f) => (0, utils_1.loadJSON)(f, context.mappings))

package/lib/context/directory/handlers/guardianPhoneFactorMessageTypes.d.ts

@@ -1,6 +1,5 @@
 import { DirectoryHandler } from '.';
-declare type ParsedGuardianFactorMessageTypes = {
-    guardianPhoneFactorMessageTypes: unknown;
-} | {};
+import { Asset, ParsedAsset } from '../../../types';
+declare type ParsedGuardianFactorMessageTypes = ParsedAsset<'guardianPhoneFactorMessageTypes', Asset>;
 declare const guardianFactorMessageTypesHandler: DirectoryHandler<ParsedGuardianFactorMessageTypes>;
 export default guardianFactorMessageTypesHandler;

package/lib/context/directory/handlers/guardianPhoneFactorMessageTypes.js

@@ -19,14 +19,14 @@ const utils_1 = require("../../../utils");
 function parse(context) {
     const guardianFolder = path_1.default.join(context.filePath, tools_1.constants.GUARDIAN_DIRECTORY);
     if (!(0, utils_1.existsMustBeDir)(guardianFolder))
-        return {}; // Skip
+        return { guardianPhoneFactorMessageTypes: null }; // Skip
     const file = path_1.default.join(guardianFolder, 'phoneFactorMessageTypes.json');
-    if ((0, utils_1.isFile)(file)) {
-        return {
-            guardianPhoneFactorMessageTypes: (0, utils_1.loadJSON)(file, context.mappings),
-        };
+    if (!(0, utils_1.isFile)(file)) {
+        return { guardianPhoneFactorMessageTypes: null };
     }
-    return {};
+    return {
+        guardianPhoneFactorMessageTypes: (0, utils_1.loadJSON)(file, context.mappings),
+    };
 }
 function dump(context) {
     return __awaiter(this, void 0, void 0, function* () {

package/lib/context/directory/handlers/guardianPhoneFactorSelectedProvider.d.ts

@@ -1,6 +1,5 @@
 import { DirectoryHandler } from '.';
-declare type ParsedGuardianFactorSelectedProvider = {
-    guardianPhoneFactorSelectedProvider: unknown;
-} | {};
+import { Asset, ParsedAsset } from '../../../types';
+declare type ParsedGuardianFactorSelectedProvider = ParsedAsset<'guardianPhoneFactorSelectedProvider', Asset>;
 declare const guardianFactorSelectedProviderHandler: DirectoryHandler<ParsedGuardianFactorSelectedProvider>;
 export default guardianFactorSelectedProviderHandler;

package/lib/context/directory/handlers/guardianPhoneFactorSelectedProvider.js

@@ -19,14 +19,14 @@ const utils_1 = require("../../../utils");
 function parse(context) {
     const guardianFolder = path_1.default.join(context.filePath, tools_1.constants.GUARDIAN_DIRECTORY);
     if (!(0, utils_1.existsMustBeDir)(guardianFolder))
-        return {}; // Skip
+        return { guardianPhoneFactorSelectedProvider: null }; // Skip
     const file = path_1.default.join(guardianFolder, 'phoneFactorSelectedProvider.json');
-    if ((0, utils_1.isFile)(file)) {
-        return {
-            guardianPhoneFactorSelectedProvider: (0, utils_1.loadJSON)(file, context.mappings),
-        };
+    if (!(0, utils_1.isFile)(file)) {
+        return { guardianPhoneFactorSelectedProvider: null };
     }
-    return {};
+    return {
+        guardianPhoneFactorSelectedProvider: (0, utils_1.loadJSON)(file, context.mappings),
+    };
 }
 function dump(context) {
     return __awaiter(this, void 0, void 0, function* () {

package/lib/context/directory/handlers/guardianPolicies.d.ts

@@ -1,6 +1,5 @@
 import { DirectoryHandler } from '.';
-declare type ParsedGuardianPolicies = {
-    guardianPolicies: unknown[];
-} | {};
+import { Asset, ParsedAsset } from '../../../types';
+declare type ParsedGuardianPolicies = ParsedAsset<'guardianPolicies', Asset[]>;
 declare const guardianPoliciesHandler: DirectoryHandler<ParsedGuardianPolicies>;
 export default guardianPoliciesHandler;

package/lib/context/directory/handlers/guardianPolicies.js

@@ -19,14 +19,14 @@ const utils_1 = require("../../../utils");
 function parse(context) {
     const guardianFolder = path_1.default.join(context.filePath, tools_1.constants.GUARDIAN_DIRECTORY);
     if (!(0, utils_1.existsMustBeDir)(guardianFolder))
-        return {}; // Skip
+        return { guardianPolicies: null }; // Skip
     const file = path_1.default.join(guardianFolder, 'policies.json');
-    if ((0, utils_1.isFile)(file)) {
-        return {
-            guardianPolicies: (0, utils_1.loadJSON)(file, context.mappings),
-        };
+    if (!(0, utils_1.isFile)(file)) {
+        return { guardianPolicies: null };
     }
-    return {};
+    return {
+        guardianPolicies: (0, utils_1.loadJSON)(file, context.mappings),
+    };
 }
 function dump(context) {
     return __awaiter(this, void 0, void 0, function* () {

package/lib/context/directory/handlers/hooks.d.ts

@@ -1,6 +1,5 @@
 import { DirectoryHandler } from '.';
-declare type ParsedHooks = {
-    hooks: unknown[] | undefined;
-};
+import { Asset, ParsedAsset } from '../../../types';
+declare type ParsedHooks = ParsedAsset<'hooks', Asset[]>;
 declare const hooksHandler: DirectoryHandler<ParsedHooks>;
 export default hooksHandler;

package/lib/context/directory/handlers/hooks.js

@@ -20,7 +20,7 @@ const logger_1 = __importDefault(require("../../../logger"));
 function parse(context) {
     const hooksFolder = path_1.default.join(context.filePath, tools_1.constants.HOOKS_DIRECTORY);
     if (!(0, utils_1.existsMustBeDir)(hooksFolder))
-        return { hooks: undefined }; // Skip
+        return { hooks: null }; // Skip
     const files = (0, utils_1.getFiles)(hooksFolder, ['.json']);
     const hooks = files.map((f) => {
         const hook = Object.assign({}, (0, utils_1.loadJSON)(f, context.mappings));
@@ -36,8 +36,8 @@ function parse(context) {
 }
 function dump(context) {
     return __awaiter(this, void 0, void 0, function* () {
-        const hooks = [...(context.assets.hooks || [])];
-        if (hooks.length < 1)
+        const hooks = context.assets.hooks;
+        if (!hooks)
             return;
         // Create Hooks folder
         const hooksFolder = path_1.default.join(context.filePath, tools_1.constants.HOOKS_DIRECTORY);

package/lib/context/directory/handlers/index.d.ts

@@ -1,12 +1,12 @@
 import DirectoryContext from '..';
-import { AssetTypes } from '../../../types';
+import { AssetTypes, Asset } from '../../../types';
 export declare type DirectoryHandler<T> = {
     dump: (context: DirectoryContext) => void;
     parse: (context: DirectoryContext) => T;
 };
 declare const directoryHandlers: {
     [key in AssetTypes]: DirectoryHandler<{
-        [key: string]: unknown;
+        [key: string]: Asset | Asset[] | null;
     }>;
 };
 export default directoryHandlers;

package/lib/context/directory/handlers/logStreams.d.ts

@@ -1,7 +1,5 @@
 import { DirectoryHandler } from '.';
-import { Asset } from '../../../types';
-declare type ParsedLogStreams = {
-    logStreams: Asset[] | undefined;
-};
+import { Asset, ParsedAsset } from '../../../types';
+declare type ParsedLogStreams = ParsedAsset<'logStreams', Asset[]>;
 declare const logStreamsHandler: DirectoryHandler<ParsedLogStreams>;
 export default logStreamsHandler;

package/lib/context/directory/handlers/logStreams.js

@@ -19,7 +19,7 @@ const utils_1 = require("../../../utils");
 function parse(context) {
     const logStreamsDirectory = path_1.default.join(context.filePath, tools_1.constants.LOG_STREAMS_DIRECTORY);
     if (!(0, utils_1.existsMustBeDir)(logStreamsDirectory))
-        return { logStreams: undefined }; // Skip
+        return { logStreams: null }; // Skip
     const foundFiles = (0, utils_1.getFiles)(logStreamsDirectory, ['.json']);
     const logStreams = foundFiles
         .map((f) => (0, utils_1.loadJSON)(f, context.mappings))
@@ -30,7 +30,7 @@ function parse(context) {
 }
 function dump(context) {
     return __awaiter(this, void 0, void 0, function* () {
-        const logStreams = context.assets.logStreams || [];
+        const logStreams = context.assets.logStreams;
         if (!logStreams)
             return; // Skip, nothing to dump
         // Create Rules folder

package/lib/context/directory/handlers/migrations.d.ts

@@ -1,6 +1,5 @@
 import { DirectoryHandler } from '.';
-declare type ParsedMigrations = {
-    migrations: unknown[];
-} | {};
+import { Asset, ParsedAsset } from '../../../types';
+declare type ParsedMigrations = ParsedAsset<'migrations', Asset[]>;
 declare const migrationsHandler: DirectoryHandler<ParsedMigrations>;
 export default migrationsHandler;