Skip to content

Commit b9d99f5

Browse files
kevinwang5658kevinwang5658
committed
feat: Refactored all codify files related folders into a parent folder called codify-files
1 parent 8ffa49a commit b9d99f5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+119
-108
lines changed

src/generators/file-modification-calculator.ts renamed to src/codify-files/generators/file-modification-calculator.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import detectIndent from 'detect-indent';
22
import jju from 'jju'
33

4-
import { Project } from '../entities/project.js';
5-
import { ProjectConfig } from '../entities/project-config.js';
6-
import { ResourceConfig } from '../entities/resource-config.js';
7-
import { FileType, InMemoryFile } from '../parser/entities.js';
4+
import { Project } from '../../entities/project.js';
5+
import { ProjectConfig } from '../../entities/project-config.js';
6+
import { ResourceConfig } from '../../entities/resource-config.js';
7+
import { prettyFormatFileDiff } from '../../ui/file-diff-pretty-printer.js';
8+
import { deepEqual } from '../../utils/index.js';
89
import { SourceMap } from '../parser/source-maps.js';
9-
import { prettyFormatFileDiff } from '../ui/file-diff-pretty-printer.js';
10-
import { deepEqual } from '../utils/index.js';
10+
import { FileType, InMemoryFile } from '../resolver/entities.js';
1111
import { FileModificationResult, ModificationType, ModifiedResource } from './index.js';
1212

1313
export class FileModificationCalculator {
@@ -163,8 +163,8 @@ export class FileModificationCalculator {
163163
const isFirst = sourceIndex === 0;
164164

165165
// We try to start deleting from the previous element to the next element if possible. This covers any spaces as well.
166-
const value = !isFirst ? this.sourceMap.lookup(`/${sourceIndex - 1}`)?.valueEnd : this.sourceMap.lookup(`/${sourceIndex}`)?.value;
167-
const valueEnd = !isLast ? this.sourceMap.lookup(`/${sourceIndex + 1}`)?.value : this.sourceMap.lookup(`/${sourceIndex}`)?.valueEnd;
166+
const value = isFirst ? this.sourceMap.lookup(`/${sourceIndex}`)?.value : this.sourceMap.lookup(`/${sourceIndex - 1}`)?.valueEnd;
167+
const valueEnd = isLast ? this.sourceMap.lookup(`/${sourceIndex}`)?.valueEnd : this.sourceMap.lookup(`/${sourceIndex + 1}`)?.value;
168168

169169
// Start one later so we leave the previous trailing comma alone
170170
const start = isFirst || isLast ? value!.position : value!.position + 1;

src/generators/index.ts renamed to src/codify-files/generators/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { ResourceConfig } from '../entities/resource-config.js';
1+
import { ResourceConfig } from '../../entities/resource-config.js';
22

33
export enum ModificationType {
44
INSERT_OR_UPDATE,

src/generators/writer.ts renamed to src/codify-files/generators/writer.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { validate } from 'uuid'
22

3-
import { DashboardApiClient } from '../api/dashboard/index.js';
4-
import { FileUtils } from '../utils/file.js';
3+
import { DashboardApiClient } from '../../api/dashboard/index.js';
4+
import { FileUtils } from '../../utils/file.js';
55

66
export class FileUpdater {
77
static async write(filePath: string, content: string) {

src/parser/config-factory.ts renamed to src/codify-files/parser/config-factory.ts

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
1-
import { ConfigBlock, ConfigType } from '../entities/config.js';
2-
import { ProjectConfig } from '../entities/project-config.js';
3-
import { ResourceConfig } from '../entities/resource-config.js';
4-
import { ParsedConfig } from './entities.js';
51
import {
62
Config,
73
ProjectConfig as ProjectConfigType,
84
ProjectSchema,
95
ResourceConfig as ResourceConfigType,
106
ResourceSchema
117
} from 'codify-schemas';
12-
import { ajv } from '../utils/ajv.js';
13-
import { AjvValidationError } from '../common/errors.js';
8+
9+
import { AjvValidationError } from '../../common/errors.js';
10+
import { ConfigBlock, ConfigType } from '../../entities/config.js';
11+
import { ProjectConfig } from '../../entities/project-config.js';
12+
import { ResourceConfig } from '../../entities/resource-config.js';
13+
import { ajv } from '../../utils/ajv.js';
14+
import { ParsedConfig } from './entities.js';
1415
import { SourceMapCache } from './source-maps.js';
1516

1617
const projectConfigValidator = ajv.compile(ProjectSchema);
@@ -22,7 +23,7 @@ class Factory {
2223
sourceMaps: SourceMapCache
2324
): ConfigBlock {
2425
const rawConfig = parsedConfig.contents;
25-
const type = parsedConfig.contents.type;
26+
const { type } = parsedConfig.contents;
2627

2728
switch (type) {
2829
case ConfigType.PROJECT: {

‎src/codify-files/parser/entities.ts‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
import { Config } from 'codify-schemas';
2+
3+
import { InMemoryFile } from '../resolver/entities.js';
4+
import { SourceMapCache } from './source-maps.js';
5+
6+
export interface ParsedConfig {
7+
contents: Config;
8+
sourceMapKey: string;
9+
}
10+
11+
export interface LanguageSpecificParser {
12+
parse(file: InMemoryFile, sourceMaps: SourceMapCache): ParsedConfig[];
13+
}

src/parser/index.ts renamed to src/codify-files/parser/index.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
import { Config } from 'codify-schemas';
22

3-
import { InternalError } from '../common/errors.js';
4-
import { ConfigBlock } from '../entities/config.js';
5-
import { Project } from '../entities/project.js';
3+
import { InternalError } from '../../common/errors.js';
4+
import { ConfigBlock } from '../../entities/config.js';
5+
import { Project } from '../../entities/project.js';
6+
import { FileType, InMemoryFile } from '../resolver/entities.js';
67
import { ConfigFactory } from './config-factory.js';
7-
import { FileType, InMemoryFile, ParsedConfig } from './entities.js';
8+
import { ParsedConfig } from './entities.js';
89
import { JsonParser } from './json/json-parser.js';
910
import { Json5Parser } from './json5/json-parser.js';
1011
import { JsoncParser } from './jsonc/json-parser.js';

src/parser/json/json-parser.test.ts renamed to src/codify-files/parser/json/json-parser.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { describe, expect, it } from 'vitest';
22
import { JsonParser } from './json-parser.js';
3-
import { FileType, InMemoryFile } from '../entities.js';
3+
import { FileType, InMemoryFile } from '../../resolver/entities';
44

55
describe('JSONParser tests', () => {
66
it('Can parse a codify json file', () => {

src/parser/json/json-parser.ts renamed to src/codify-files/parser/json/json-parser.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
import { Config, ConfigFileSchema } from 'codify-schemas';
2-
import * as jsonSourceMap from 'json-source-map';
2+
import * as jsonSourceMap from 'json-source-map'
33
import parseJson from 'parse-json';
44

5-
import { AjvValidationError, SyntaxError } from '../../common/errors.js';
6-
import { ajv } from '../../utils/ajv.js';
7-
import { InMemoryFile, LanguageSpecificParser, ParsedConfig } from '../entities.js';
5+
import { AjvValidationError, SyntaxError } from '../../../common/errors.js';
6+
import { ajv } from '../../../utils/ajv.js';
7+
import { InMemoryFile } from '../../resolver/entities.js';
8+
import { LanguageSpecificParser, ParsedConfig } from '../entities.js';
89
import { SourceMapCache } from '../source-maps.js';
910

1011
const validator = ajv.compile(ConfigFileSchema);

src/parser/json/json-source-map.d.ts renamed to src/codify-files/parser/json/json-source-map.d.ts

File renamed without changes.

src/parser/json/source-map.ts renamed to src/codify-files/parser/json/source-map.ts

File renamed without changes.

0 commit comments

Comments
 (0)