Skip to content

Commit

Permalink
chore: clean up project
Browse files Browse the repository at this point in the history
  • Loading branch information
@xhayper
xhayper committed Feb 28, 2024
1 parent bb263a8 commit 71dc0eb
Show file tree
Hide file tree
Showing 8 changed files with 16 additions and 102 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/CI.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
with:
node-version: 20

- uses: pnpm/action-setup@v2
- uses: pnpm/action-setup@v3
with:
version: 8
run_install: false
Expand All @@ -24,7 +24,7 @@ jobs:
run: |
echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
- uses: actions/cache@v3
- uses: actions/cache@v4
name: Setup pnpm cache
with:
path: ${{ env.STORE_PATH }}
Expand Down
1 change: 0 additions & 1 deletion src/simaiConvert.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ export class SimaiConvert {
public static deserialize(data: string): MaiChart {
const tokens = new Tokenizer(data).getTokens();
const chart = new Deserializer(tokens).getChart();

return chart;
}

Expand Down
5 changes: 2 additions & 3 deletions src/simaiFile.ts
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
export class SimaiFile {
// TODO: PLACEHOLDER
public data: string = "";

constructor(data: string) {
Expand Down Expand Up @@ -34,7 +33,7 @@ export class SimaiFile {
return result;
}

public getValue(key: string): string {
return this.toKeyValuePairs().get(key) ?? "";
public getValue(key: string): string | undefined {
return this.toKeyValuePairs().get(key);
}
}
4 changes: 2 additions & 2 deletions src/structures/location.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ export class Location {
case NoteGroup.ESensor:
groupChar = "E";
break;
// default:
// throw new ArgumentOutOfRangeException();
default:
throw new Error("Unknown note group");
}

return groupChar + (this.index + 1).toString();
Expand Down
4 changes: 2 additions & 2 deletions src/structures/slideSegment.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ export class SlideSegment {
writer += `pp${this.vertices[0]}`;
case SlideType.Fan:
writer += `w${this.vertices[0]}`;
// default:
// throw new ArguementOutOfRangeException();
default:
throw new Error("Unknown slide type");
}

return writer;
Expand Down
14 changes: 7 additions & 7 deletions tests/chartTests.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ describe("SimaiConvert", () => {
const chartText = await fs.readFile(path.join(testChartPath, "./CanReadEmptyChart.txt"), "utf-8");

const simaiFile = new SimaiFile(chartText);
const chart = SimaiConvert.deserialize(simaiFile.getValue("inote_1"));
const chart = SimaiConvert.deserialize(simaiFile.getValue("inote_1")!);

assert.equal(chart.noteCollections.length, 0);
});
Expand All @@ -21,7 +21,7 @@ describe("SimaiConvert", () => {
const chartText = await fs.readFile(path.join(testChartPath, "./CanReadSingularLocation.txt"), "utf-8");

const simaiFile = new SimaiFile(chartText);
const chart = SimaiConvert.deserialize(simaiFile.getValue("inote_1"));
const chart = SimaiConvert.deserialize(simaiFile.getValue("inote_1")!);

assert.equal(chart.noteCollections.length, 1);
assert.equal(chart.noteCollections[0].length, 1);
Expand All @@ -32,7 +32,7 @@ describe("SimaiConvert", () => {
const chartText = await fs.readFile(path.join(testChartPath, "./CanReadLocationsWithSeparators.txt"), "utf-8");

const simaiFile = new SimaiFile(chartText);
const chart = SimaiConvert.deserialize(simaiFile.getValue("inote_1"));
const chart = SimaiConvert.deserialize(simaiFile.getValue("inote_1")!);

assert.equal(chart.noteCollections.length, 1);
assert.equal(chart.noteCollections[0].length, 8);
Expand All @@ -53,7 +53,7 @@ describe("SimaiConvert", () => {
);

const simaiFile = new SimaiFile(chartText);
const chart = SimaiConvert.deserialize(simaiFile.getValue("inote_1"));
const chart = SimaiConvert.deserialize(simaiFile.getValue("inote_1")!);

assert.equal(chart.noteCollections.length, 1);
assert.equal(chart.noteCollections[0].length, 8);
Expand All @@ -74,7 +74,7 @@ describe("SimaiConvert", () => {
);

const simaiFile = new SimaiFile(chartText);
const chart = SimaiConvert.deserialize(simaiFile.getValue("inote_1"));
const chart = SimaiConvert.deserialize(simaiFile.getValue("inote_1")!);

assert.equal(chart.noteCollections.length, 2);
assert.equal(chart.noteCollections[1].time, 1);
Expand All @@ -87,7 +87,7 @@ describe("SimaiConvert", () => {
);

const simaiFile = new SimaiFile(chartText);
const chart = SimaiConvert.deserialize(simaiFile.getValue("inote_1"));
const chart = SimaiConvert.deserialize(simaiFile.getValue("inote_1")!);

assert.equal(chart.noteCollections.length, 3);
assert.equal(chart.noteCollections[1].time, 1);
Expand All @@ -98,7 +98,7 @@ describe("SimaiConvert", () => {
const chartText = await fs.readFile(path.join(testChartPath, "../fileTests/0.txt"), "utf-8");

const simaiFile = new SimaiFile(chartText);
const chart = SimaiConvert.deserialize(simaiFile.getValue("inote_3"));
const chart = SimaiConvert.deserialize(simaiFile.getValue("inote_3")!);

const serialized = SimaiConvert.serialize(chart);
console.log(serialized);
Expand Down
2 changes: 1 addition & 1 deletion tests/fileTests.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ describe("SimaiFile", () => {

it("should be able to read multiline chart", () => {
// kvp here somehow have \r\n?
const kvp = _simaiFile.getValue("inote_3");
const kvp = _simaiFile.getValue("inote_3")!;
assert.equal(
kvp.replace(/\r\n/g, "\n"),
`(170){16}7/2-6[8:1],,1-5[8:1],8,2,,1,,
Expand Down
84 changes: 0 additions & 84 deletions tsconfig.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,108 +2,24 @@
"compilerOptions": {
/* Visit https://aka.ms/tsconfig to read more about this file */

/* Projects */
// "incremental": true, /* Save .tsbuildinfo files to allow for incremental compilation of projects. */
// "composite": true, /* Enable constraints that allow a TypeScript project to be used with project references. */
// "tsBuildInfoFile": "./.tsbuildinfo", /* Specify the path to .tsbuildinfo incremental compilation file. */
// "disableSourceOfProjectReferenceRedirect": true, /* Disable preferring source files instead of declaration files when referencing composite projects. */
// "disableSolutionSearching": true, /* Opt a project out of multi-project reference checking when editing. */
// "disableReferencedProjectLoad": true, /* Reduce the number of projects loaded automatically by TypeScript. */

/* Language and Environment */
"target": "es2016" /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */,
// "lib": [], /* Specify a set of bundled library declaration files that describe the target runtime environment. */
// "jsx": "preserve", /* Specify what JSX code is generated. */
// "experimentalDecorators": true, /* Enable experimental support for legacy experimental decorators. */
// "emitDecoratorMetadata": true, /* Emit design-type metadata for decorated declarations in source files. */
// "jsxFactory": "", /* Specify the JSX factory function used when targeting React JSX emit, e.g. 'React.createElement' or 'h'. */
// "jsxFragmentFactory": "", /* Specify the JSX Fragment reference used for fragments when targeting React JSX emit e.g. 'React.Fragment' or 'Fragment'. */
// "jsxImportSource": "", /* Specify module specifier used to import the JSX factory functions when using 'jsx: react-jsx*'. */
// "reactNamespace": "", /* Specify the object invoked for 'createElement'. This only applies when targeting 'react' JSX emit. */
// "noLib": true, /* Disable including any library files, including the default lib.d.ts. */
// "useDefineForClassFields": true, /* Emit ECMAScript-standard-compliant class fields. */
// "moduleDetection": "auto", /* Control what method is used to detect module-format JS files. */

/* Modules */
"module": "commonjs" /* Specify what module code is generated. */,
// "rootDir": "./", /* Specify the root folder within your source files. */
// "moduleResolution": "node10", /* Specify how TypeScript looks up a file from a given module specifier. */
// "baseUrl": "./", /* Specify the base directory to resolve non-relative module names. */
// "paths": {}, /* Specify a set of entries that re-map imports to additional lookup locations. */
// "rootDirs": [], /* Allow multiple folders to be treated as one when resolving modules. */
// "typeRoots": [], /* Specify multiple folders that act like './node_modules/@types'. */
// "types": [], /* Specify type package names to be included without being referenced in a source file. */
// "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */
// "moduleSuffixes": [], /* List of file name suffixes to search when resolving a module. */
// "allowImportingTsExtensions": true, /* Allow imports to include TypeScript file extensions. Requires '--moduleResolution bundler' and either '--noEmit' or '--emitDeclarationOnly' to be set. */
// "resolvePackageJsonExports": true, /* Use the package.json 'exports' field when resolving package imports. */
// "resolvePackageJsonImports": true, /* Use the package.json 'imports' field when resolving imports. */
// "customConditions": [], /* Conditions to set in addition to the resolver-specific defaults when resolving imports. */
// "resolveJsonModule": true, /* Enable importing .json files. */
// "allowArbitraryExtensions": true, /* Enable importing files with any extension, provided a declaration file is present. */
// "noResolve": true, /* Disallow 'import's, 'require's or '<reference>'s from expanding the number of files TypeScript should add to a project. */

/* JavaScript Support */
// "allowJs": true, /* Allow JavaScript files to be a part of your program. Use the 'checkJS' option to get errors from these files. */
// "checkJs": true, /* Enable error reporting in type-checked JavaScript files. */
// "maxNodeModuleJsDepth": 1, /* Specify the maximum folder depth used for checking JavaScript files from 'node_modules'. Only applicable with 'allowJs'. */

/* Emit */
"declaration": true /* Generate .d.ts files from TypeScript and JavaScript files in your project. */,
// "declarationMap": true, /* Create sourcemaps for d.ts files. */
// "emitDeclarationOnly": true, /* Only output d.ts files and not JavaScript files. */
// "sourceMap": true, /* Create source map files for emitted JavaScript files. */
// "inlineSourceMap": true, /* Include sourcemap files inside the emitted JavaScript. */
// "outFile": "./", /* Specify a file that bundles all outputs into one JavaScript file. If 'declaration' is true, also designates a file that bundles all .d.ts output. */
"outDir": "./dist" /* Specify an output folder for all emitted files. */,
// "removeComments": true, /* Disable emitting comments. */
// "noEmit": true, /* Disable emitting files from a compilation. */
// "importHelpers": true, /* Allow importing helper functions from tslib once per project, instead of including them per-file. */
// "importsNotUsedAsValues": "remove", /* Specify emit/checking behavior for imports that are only used for types. */
// "downlevelIteration": true, /* Emit more compliant, but verbose and less performant JavaScript for iteration. */
// "sourceRoot": "", /* Specify the root path for debuggers to find the reference source code. */
// "mapRoot": "", /* Specify the location where debugger should locate map files instead of generated locations. */
// "inlineSources": true, /* Include source code in the sourcemaps inside the emitted JavaScript. */
// "emitBOM": true, /* Emit a UTF-8 Byte Order Mark (BOM) in the beginning of output files. */
// "newLine": "crlf", /* Set the newline character for emitting files. */
// "stripInternal": true, /* Disable emitting declarations that have '@internal' in their JSDoc comments. */
// "noEmitHelpers": true, /* Disable generating custom helper functions like '__extends' in compiled output. */
// "noEmitOnError": true, /* Disable emitting files if any type checking errors are reported. */
// "preserveConstEnums": true, /* Disable erasing 'const enum' declarations in generated code. */
// "declarationDir": "./", /* Specify the output directory for generated declaration files. */
// "preserveValueImports": true, /* Preserve unused imported values in the JavaScript output that would otherwise be removed. */

/* Interop Constraints */
// "isolatedModules": true, /* Ensure that each file can be safely transpiled without relying on other imports. */
// "verbatimModuleSyntax": true, /* Do not transform or elide any imports or exports not marked as type-only, ensuring they are written in the output file's format based on the 'module' setting. */
// "allowSyntheticDefaultImports": true, /* Allow 'import x from y' when a module doesn't have a default export. */
"esModuleInterop": true /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables 'allowSyntheticDefaultImports' for type compatibility. */,
// "preserveSymlinks": true, /* Disable resolving symlinks to their realpath. This correlates to the same flag in node. */
"forceConsistentCasingInFileNames": true /* Ensure that casing is correct in imports. */,

/* Type Checking */
"strict": true /* Enable all strict type-checking options. */,
// "noImplicitAny": true, /* Enable error reporting for expressions and declarations with an implied 'any' type. */
// "strictNullChecks": true, /* When type checking, take into account 'null' and 'undefined'. */
// "strictFunctionTypes": true, /* When assigning functions, check to ensure parameters and the return values are subtype-compatible. */
// "strictBindCallApply": true, /* Check that the arguments for 'bind', 'call', and 'apply' methods match the original function. */
// "strictPropertyInitialization": true, /* Check for class properties that are declared but not set in the constructor. */
// "noImplicitThis": true, /* Enable error reporting when 'this' is given the type 'any'. */
// "useUnknownInCatchVariables": true, /* Default catch clause variables as 'unknown' instead of 'any'. */
// "alwaysStrict": true, /* Ensure 'use strict' is always emitted. */
// "noUnusedLocals": true, /* Enable error reporting when local variables aren't read. */
// "noUnusedParameters": true, /* Raise an error when a function parameter isn't read. */
// "exactOptionalPropertyTypes": true, /* Interpret optional property types as written, rather than adding 'undefined'. */
// "noImplicitReturns": true, /* Enable error reporting for codepaths that do not explicitly return in a function. */
// "noFallthroughCasesInSwitch": true, /* Enable error reporting for fallthrough cases in switch statements. */
// "noUncheckedIndexedAccess": true, /* Add 'undefined' to a type when accessed using an index. */
// "noImplicitOverride": true, /* Ensure overriding members in derived classes are marked with an override modifier. */
// "noPropertyAccessFromIndexSignature": true, /* Enforces using indexed accessors for keys declared using an indexed type. */
// "allowUnusedLabels": true, /* Disable error reporting for unused labels. */
// "allowUnreachableCode": true, /* Disable error reporting for unreachable code. */

/* Completeness */
// "skipDefaultLibCheck": true, /* Skip type checking .d.ts files that are included with TypeScript. */
"skipLibCheck": true /* Skip type checking all .d.ts files. */
},
"include": ["src"]
Expand Down

0 comments on commit 71dc0eb

Please sign in to comment.