refactor: reorganize scratch org files

src/index.ts

@@ -96,16 +96,16 @@ export {
   ScratchOrgCreateResult,
   scratchOrgCreate,
   scratchOrgResume,
-} from './org/scratchOrgCreate';
+} from './org/scratch/scratchOrgCreate';
 
-export { ScratchOrgInfo } from './org/scratchOrgTypes';
+export { ScratchOrgInfo } from './org/scratch/types';
 export {
   ScratchOrgLifecycleEvent,
   scratchOrgLifecycleEventName,
   scratchOrgLifecycleStages,
-} from './org/scratchOrgLifecycleEvents';
-export { ScratchOrgCache } from './org/scratchOrgCache';
-export { default as ScratchOrgSettingsGenerator } from './org/scratchOrgSettingsGenerator';
+} from './org/scratch/lifecycle';
+export { ScratchOrgCache } from './org/scratch/scratchOrgCache';
+export { default as ScratchOrgSettingsGenerator } from './org/scratch/settingsGenerator';
 
 // Utility sub-modules
 export * from './util/sfdc';

src/org/org.ts

@@ -38,7 +38,7 @@ import { PollingClient } from '../status/pollingClient';
 import { StatusResult } from '../status/types';
 import { Connection, SingleRecordQueryErrors } from './connection';
 import { AuthFields, AuthInfo } from './authInfo';
-import { scratchOrgCreate, ScratchOrgCreateOptions, ScratchOrgCreateResult } from './scratchOrgCreate';
+import { scratchOrgCreate, ScratchOrgCreateOptions, ScratchOrgCreateResult } from './scratch/scratchOrgCreate';
 import { OrgConfigProperties } from './orgConfigProperties';
 
 Messages.importMessagesDirectory(__dirname);

src/org/scratchOrgErrorCodes.ts → src/org/scratch/errorCodes.ts

@@ -6,12 +6,12 @@
  */
 
 import { Optional } from '@salesforce/ts-types';
-import { Messages } from '../messages';
-import { SfError } from '../sfError';
-import { Logger } from '../logger/logger';
-import { ScratchOrgInfo } from './scratchOrgTypes';
+import { Messages } from '../../messages';
+import { SfError } from '../../sfError';
+import { Logger } from '../../logger/logger';
+import { ScratchOrgInfo } from './types';
 import { ScratchOrgCache } from './scratchOrgCache';
-import { emit } from './scratchOrgLifecycleEvents';
+import { emit } from './lifecycle';
 
 const WORKSPACE_CONFIG_FILENAME = 'sfdx-project.json';
 

src/org/scratchOrgFeatureDeprecation.ts → src/org/scratch/featureDeprecation.ts

@@ -13,7 +13,7 @@
 import { isString } from '@salesforce/ts-types';
 
 // Local
-import { Messages } from '../messages';
+import { Messages } from '../../messages';
 Messages.importMessagesDirectory(__dirname);
 const messages = Messages.loadMessages('@salesforce/core', 'scratchOrgFeatureDeprecation');
 const FEATURE_TYPES = {

src/org/scratchOrgLifecycleEvents.ts → src/org/scratch/lifecycle.ts

@@ -4,9 +4,9 @@
  * Licensed under the BSD 3-Clause license.
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
-import { Lifecycle } from '../lifecycleEvents';
-import { AuthFields } from './authInfo';
-import { ScratchOrgInfo } from './scratchOrgTypes';
+import { Lifecycle } from '../../lifecycleEvents';
+import { AuthFields } from '../authInfo';
+import { ScratchOrgInfo } from './types';
 
 export const scratchOrgLifecycleEventName = 'scratchOrgLifecycleEvent';
 export const scratchOrgLifecycleStages = [

src/org/scratchOrgCache.ts → src/org/scratch/scratchOrgCache.ts

@@ -6,8 +6,8 @@
  */
 import { Duration } from '@salesforce/kit';
 import { JsonMap } from '@salesforce/ts-types';
-import { Global } from '../global';
-import { TTLConfig } from '../config/ttlConfig';
+import { Global } from '../../global';
+import { TTLConfig } from '../../config/ttlConfig';
 
 export type CachedOptions = {
   hubUsername: string;

src/org/scratchOrgCreate.ts → src/org/scratch/scratchOrgCreate.ts

@@ -6,13 +6,14 @@
  */
 import { Duration, toBoolean } from '@salesforce/kit';
 import { ensureString } from '@salesforce/ts-types';
-import { Messages } from '../messages';
-import { Logger } from '../logger/logger';
-import { ConfigAggregator } from '../config/configAggregator';
-import { OrgConfigProperties } from '../org/orgConfigProperties';
-import { SfProject } from '../sfProject';
-import { StateAggregator } from '../stateAggregator/stateAggregator';
-import { Org } from './org';
+import { Messages } from '../../messages';
+import { Logger } from '../../logger/logger';
+import { ConfigAggregator } from '../../config/configAggregator';
+import { OrgConfigProperties } from '../orgConfigProperties';
+import { SfProject } from '../../sfProject';
+import { StateAggregator } from '../../stateAggregator/stateAggregator';
+import { Org } from '../org';
+import { AuthFields, AuthInfo } from '../authInfo';
 import {
   authorizeScratchOrg,
   requestScratchOrgCreation,
@@ -21,13 +22,12 @@ import {
   resolveUrl,
   queryScratchOrgInfo,
 } from './scratchOrgInfoApi';
-import { ScratchOrgInfo } from './scratchOrgTypes';
-import SettingsGenerator from './scratchOrgSettingsGenerator';
+import { ScratchOrgInfo } from './types';
+import SettingsGenerator from './settingsGenerator';
 import { generateScratchOrgInfo, getScratchOrgInfoPayload } from './scratchOrgInfoGenerator';
-import { AuthFields, AuthInfo } from './authInfo';
-import { emit, emitPostOrgCreate } from './scratchOrgLifecycleEvents';
+import { emit, emitPostOrgCreate } from './lifecycle';
 import { ScratchOrgCache } from './scratchOrgCache';
-import { validateScratchOrgInfoForResume } from './scratchOrgErrorCodes';
+import { validateScratchOrgInfoForResume } from './errorCodes';
 
 Messages.importMessagesDirectory(__dirname);
 const messages = Messages.loadMessages('@salesforce/core', 'scratchOrgCreate');

src/org/scratchOrgInfoApi.ts → src/org/scratch/scratchOrgInfoApi.ts

@@ -10,22 +10,22 @@ import { env, Duration, upperFirst, omit } from '@salesforce/kit';
 import { AnyJson } from '@salesforce/ts-types';
 import { OAuth2Config, SaveResult } from '@jsforce/jsforce-node';
 import { retryDecorator, RetryError } from 'ts-retry-promise';
-import { JwtOAuth2Config } from '../org/authInfo';
-import { Logger } from '../logger/logger';
-import { Messages } from '../messages';
-import { SfError } from '../sfError';
-import { SfdcUrl } from '../util/sfdcUrl';
-import { StatusResult } from '../status/types';
-import { PollingClient } from '../status/pollingClient';
-import { MyDomainResolver } from '../status/myDomainResolver';
-import { Lifecycle } from '../lifecycleEvents';
-import mapKeys from '../util/mapKeys';
-import { AuthInfo } from './authInfo';
-import { Org } from './org';
-import { checkScratchOrgInfoForErrors } from './scratchOrgErrorCodes';
-import SettingsGenerator from './scratchOrgSettingsGenerator';
-import { ScratchOrgInfo } from './scratchOrgTypes';
-import { emit } from './scratchOrgLifecycleEvents';
+import { JwtOAuth2Config } from '../authInfo';
+import { Logger } from '../../logger/logger';
+import { Messages } from '../../messages';
+import { SfError } from '../../sfError';
+import { SfdcUrl } from '../../util/sfdcUrl';
+import { StatusResult } from '../../status/types';
+import { PollingClient } from '../../status/pollingClient';
+import { MyDomainResolver } from '../../status/myDomainResolver';
+import { Lifecycle } from '../../lifecycleEvents';
+import mapKeys from '../../util/mapKeys';
+import { AuthInfo } from '../authInfo';
+import { Org } from '../org';
+import { checkScratchOrgInfoForErrors } from './errorCodes';
+import SettingsGenerator from './settingsGenerator';
+import { ScratchOrgInfo } from './types';
+import { emit } from './lifecycle';
 
 // preserving because it extends a class
 // eslint-disable-next-line @typescript-eslint/consistent-type-definitions

src/org/scratch/scratchOrgInfoGenerator.ts

@@ -14,8 +14,8 @@ import { SfError } from '../../sfError';
 import { Org } from '../org';
 import { DEFAULT_CONNECTED_APP_INFO } from '../authInfo';
 import { queryAncestorFromHighest, packageHasAncestorVersion, queryIdFromAncestorVersion } from './ancestorQueries';
-import { ScratchOrgInfo } from './scratchOrgTypes';
-import { ScratchOrgFeatureDeprecation } from './scratchOrgFeatureDeprecation';
+import { ScratchOrgInfo } from './types';
+import { ScratchOrgFeatureDeprecation } from './featureDeprecation';
 
 Messages.importMessagesDirectory(__dirname);
 export const messages = Messages.loadMessages('@salesforce/core', 'scratchOrgInfoGenerator');

src/org/scratchOrgSettingsGenerator.ts → src/org/scratch/settingsGenerator.ts

@@ -9,17 +9,17 @@ import * as path from 'node:path';
 import { isEmpty, env, upperFirst, Duration } from '@salesforce/kit';
 import { ensureObject, JsonMap } from '@salesforce/ts-types';
 import * as js2xmlparser from 'js2xmlparser';
-import { Logger } from '../logger/logger';
-import { SfError } from '../sfError';
-import { StructuredWriter } from '../util/structuredWriter';
-import { StatusResult } from '../status/types';
-import { PollingClient } from '../status/pollingClient';
-import { ZipWriter } from '../util/zipWriter';
-import { DirectoryWriter } from '../util/directoryWriter';
-import { Lifecycle } from '../lifecycleEvents';
-import { Messages } from '../messages';
-import { ScratchOrgInfo, ObjectSetting } from './scratchOrgTypes';
-import { Org } from './org';
+import { Logger } from '../../logger/logger';
+import { SfError } from '../../sfError';
+import { StructuredWriter } from '../../util/structuredWriter';
+import { StatusResult } from '../../status/types';
+import { PollingClient } from '../../status/pollingClient';
+import { ZipWriter } from '../../util/zipWriter';
+import { DirectoryWriter } from '../../util/directoryWriter';
+import { Lifecycle } from '../../lifecycleEvents';
+import { Messages } from '../../messages';
+import { Org } from '../org';
+import { ScratchOrgInfo, ObjectSetting } from './types';
 
 Messages.importMessagesDirectory(__dirname);
 

test/unit/org/scratchOrgCreateTest.ts

@@ -11,8 +11,8 @@ import { Connection } from '@jsforce/jsforce-node';
 import { Org } from '../../../src/org/org';
 import { AuthInfo } from '../../../src/org/authInfo';
 import { SfProject, SfProjectJson } from '../../../src/sfProject';
-import { scratchOrgCreate, ScratchOrgCreateOptions, scratchOrgResume } from '../../../src/org/scratchOrgCreate';
-import { ScratchOrgCache } from '../../../src/org/scratchOrgCache';
+import { scratchOrgCreate, ScratchOrgCreateOptions, scratchOrgResume } from '../../../src/org/scratch/scratchOrgCreate';
+import { ScratchOrgCache } from '../../../src/org/scratch/scratchOrgCache';
 
 const packageId = '05iB0000000cWwnIAE';
 const packageVersionSubscriberId = '04tB0000000cWwnIAE';

test/unit/org/scratchOrgErrorCodesTest.ts

@@ -6,8 +6,8 @@
  */
 import { expect } from 'chai';
 import { SfError } from '../../../src/sfError';
-import { ScratchOrgInfo } from '../../../src/org/scratchOrgTypes';
-import { checkScratchOrgInfoForErrors } from '../../../src/org/scratchOrgErrorCodes';
+import { ScratchOrgInfo } from '../../../src/org/scratch/types';
+import { checkScratchOrgInfoForErrors } from '../../../src/org/scratch/errorCodes';
 import { shouldThrow } from '../../../src/testSetup';
 
 const testUsername = 'foo';

test/unit/org/scratchOrgFeatureDeprecationTest.ts

@@ -6,7 +6,7 @@
  */
 
 import { expect } from 'chai';
-import { ScratchOrgFeatureDeprecation } from '../../../src/org/scratchOrgFeatureDeprecation';
+import { ScratchOrgFeatureDeprecation } from '../../../src/org/scratch/featureDeprecation';
 
 describe('scratchOrgFeatureDeprecation', () => {
   const FEATURE_TYPES = {

test/unit/org/scratchOrgInfoApiTest.ts

@@ -15,17 +15,17 @@ import { Connection } from '../../../src/org/connection';
 import { AuthInfo } from '../../../src/org/authInfo';
 import { shouldThrow } from '../../../src/testSetup';
 import { MyDomainResolver } from '../../../src/status/myDomainResolver';
-import SettingsGenerator from '../../../src/org/scratchOrgSettingsGenerator';
-import * as mockForStandaloneFunctions from '../../../src/org/scratchOrgInfoApi';
+import SettingsGenerator from '../../../src/org/scratch/settingsGenerator';
+import * as mockForStandaloneFunctions from '../../../src/org/scratch/scratchOrgInfoApi';
 import {
   authorizeScratchOrg,
   deploySettings,
   JsForceError,
   pollForScratchOrgInfo,
   requestScratchOrgCreation,
   resolveUrl,
-} from '../../../src/org/scratchOrgInfoApi';
-import { ScratchOrgInfo } from '../../../src/org/scratchOrgTypes';
+} from '../../../src/org/scratch/scratchOrgInfoApi';
+import { ScratchOrgInfo } from '../../../src/org/scratch/types';
 import { Messages } from '../../../src/messages';
 import { SfError } from '../../../src/sfError';
 

test/unit/org/scratchOrgInfoGeneratorTest.ts

@@ -17,7 +17,7 @@ import {
   getAncestorIds,
   generateScratchOrgInfo,
   getScratchOrgInfoPayload,
-} from '../../../src/org/scratchOrgInfoGenerator';
+} from '../../../src/org/scratch/scratchOrgInfoGenerator';
 import { SfProjectJson } from '../../../src/sfProject';
 import { Messages } from '../../../src/messages';
 

test/unit/org/scratchOrgSettingsGeneratorTest.ts

@@ -12,11 +12,11 @@ import { Org } from '../../../src/org/org';
 import { Connection } from '../../../src/org/connection';
 import { validateApiVersion } from '../../../src/util/sfdc';
 import { ZipWriter } from '../../../src/util/zipWriter';
-import { ScratchOrgInfo } from '../../../src/org/scratchOrgTypes';
+import { ScratchOrgInfo } from '../../../src/org/scratch/types';
 import SettingsGenerator, {
   createObjectFileContent,
   createRecordTypeAndBusinessProcessFileContent,
-} from '../../../src/org/scratchOrgSettingsGenerator';
+} from '../../../src/org/scratch/settingsGenerator';
 import { MockTestOrgData, shouldThrow } from '../../../src/testSetup';
 
 const TEMPLATE_SCRATCH_ORG_INFO: ScratchOrgInfo = {
@@ -399,7 +399,7 @@ describe('scratchOrgSettingsGenerator', () => {
       sandbox.restore();
     });
 
-    it('tries to deploy the settings to the org pools untill succeded', async () => {
+    it('tries to deploy the settings to the org pools until succeeded', async () => {
       const scratchDef = {
         ...TEMPLATE_SCRATCH_ORG_INFO,
         settings: {
@@ -505,7 +505,7 @@ describe('scratchOrgSettingsGenerator', () => {
       sandbox.restore();
     });
 
-    it('tries to deploy the settings to the org pools untill timeouts', async () => {
+    it('tries to deploy the settings to the org pools until timeouts', async () => {
       const timeout = 10 * 60 * 1000; // 10 minutes
       const frequency = 1000;
       const settings = new SettingsGenerator();