Fix test config

package.json

@@ -14,9 +14,9 @@
   "author": "Florian Cassayre",
   "license": "MIT",
   "scripts": {
-    "build": "tsc",
-    "build:clean": "rimraf dist && tsc",
-    "docs": "typedoc",
+    "build": "tsc -p tsconfig-build.json",
+    "build:clean": "rimraf dist && npm run build",
+    "docs": "typedoc --tsconfig tsconfig-build.json",
     "test": "mocha -r ts-node/register tests/**/*.test.ts",
     "lint": "npx eslint src/ tests/ --ext .ts --fix"
   },

src/parse/decoding/cp1252.ts

@@ -11,7 +11,7 @@ export const decodeCp1252: FileDecoder = (buffer, progressCallback?) => {
 
     const byteBuffer = new Uint8Array(buffer);
     let outputView = '';
-    let i = 0
+    let i = 0;
     for (; i < byteBuffer.length; i++) {
         outputView += CP1252_TABLE.charAt(byteBuffer[i]);
 

src/parse/structurer.ts

@@ -11,9 +11,9 @@ const PROGRESS_INTERVAL = 50000;
  * @param progressCallback See {@link GedcomReadingPhase.progressCallback}
  */
 export const buildTree = (lines: Iterable<RegExpExecArray>,
-                          noInlineContinuations: boolean = false,
+                          noInlineContinuations = false,
                           progressCallback: ((charsRead: number) => void) | null = null): GedcomTree.NodeRoot => {
-    if(progressCallback) {
+    if (progressCallback) {
         progressCallback(0);
     }
 
@@ -28,8 +28,8 @@ export const buildTree = (lines: Iterable<RegExpExecArray>,
         const level = parseInt(levelStr);
         const isSameOrUpperLevel = level <= currentLevel, isDownLevel = level === currentLevel + 1;
 
-        if (level < 0 || !isSameOrUpperLevel && !isDownLevel) {
-            throw new GedcomError.InvalidNestingError(`Bad nesting level at line ${i + 1} (current is ${currentLevel}, got ${level})`, i + 1, currentLevel, level);
+        if (level < 0 || (!isSameOrUpperLevel && !isDownLevel)) {
+            throw new GedcomError.InvalidNestingError(`Illegal nesting level at line ${i + 1} (current is ${currentLevel}, got ${level})`, i + 1, currentLevel, level);
         }
 
         const levelDifference = currentLevel - level + 1;
@@ -78,12 +78,12 @@ export const buildTree = (lines: Iterable<RegExpExecArray>,
 
         i++;
 
-        if(progressCallback && i % PROGRESS_INTERVAL === 0) {
+        if (progressCallback && i % PROGRESS_INTERVAL === 0) {
             progressCallback(charsRead);
         }
     }
 
-    if(progressCallback) {
+    if (progressCallback) {
         progressCallback(charsRead);
     }
 

src/selection/index.ts

@@ -65,7 +65,7 @@ import { SelectionSpouseFamilyLink } from './SelectionSpouseFamilyLink';
 import { SelectionSubmitterRecord } from './SelectionSubmitterRecord';
 import { SelectionSubmitterReference } from './SelectionSubmitterReference';
 import { SelectionTime } from './SelectionTime';
-import { SelectionWithNoteMixin, SelectionWithSourceCitationMixin } from './mixin';
+import { SelectionWithAddressMixin, SelectionWithNoteMixin, SelectionWithNoteSourceCitationMixin, SelectionWithSourceCitationMixin } from './mixin';
 import { SelectionAny } from './SelectionAny';
 import { SelectionGedcom } from './SelectionGedcom';
 
@@ -141,7 +141,9 @@ namespace SelectionSubmitterRecord {}
 namespace SelectionSubmitterReference {}
 namespace SelectionTime {}
 
+namespace SelectionWithAddressMixin {}
 namespace SelectionWithNoteMixin {}
+namespace SelectionWithNoteSourceCitationMixin {}
 namespace SelectionWithSourceCitationMixin {}
 // TODO add all mixins
 
@@ -285,7 +287,9 @@ export namespace GedcomSelection {
     export import Time = SelectionTime;
 
     export namespace Mixin {
+        export import WithAddress = SelectionWithAddressMixin;
         export import WithNote = SelectionWithNoteMixin;
+        export import WithNoteSourceCitation = SelectionWithNoteSourceCitationMixin;
         export import WithSourceCitation = SelectionWithSourceCitationMixin;
     }
 }

tsconfig-build.json

@@ -0,0 +1,11 @@
+{
+  "extends": "./tsconfig.json",
+  "exclude": [
+    "tests/**/*"
+  ],
+  "typedocOptions": {
+    "entryPoints": ["src/index.ts"],
+    "out": "docs",
+    "excludeExternals": true
+  }
+}

tsconfig.json

@@ -1,74 +1,18 @@
 {
   "compilerOptions": {
-    /* Visit https://aka.ms/tsconfig.json to read more about this file */
-
-    /* Basic Options */
-    // "incremental": true,                         /* Enable incremental compilation */
-    "target": "es5",                                /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', 'ES2021', or 'ESNEXT'. */
-    "module": "commonjs",                           /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */
-    // "lib": [],                                   /* Specify library files to be included in the compilation. */
-    // "allowJs": true,                             /* Allow javascript files to be compiled. */
-    // "checkJs": true,                             /* Report errors in .js files. */
-    // "jsx": "preserve",                           /* Specify JSX code generation: 'preserve', 'react-native', 'react', 'react-jsx' or 'react-jsxdev'. */
-    "declaration": true,                            /* Generates corresponding '.d.ts' file. */
-    // "declarationMap": true,                      /* Generates a sourcemap for each corresponding '.d.ts' file. */
-    "sourceMap": true,                              /* Generates corresponding '.map' file. */
-    // "outFile": "./",                             /* Concatenate and emit output to single file. */
-    "outDir": "./dist",                             /* Redirect output structure to the directory. */
-    "rootDir": "./src",                             /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */
-    // "composite": true,                           /* Enable project compilation */
-    // "tsBuildInfoFile": "./",                     /* Specify file to store incremental compilation information */
-    // "removeComments": true,                      /* Do not emit comments to output. */
-    // "noEmit": true,                              /* Do not emit outputs. */
-    // "importHelpers": true,                       /* Import emit helpers from 'tslib'. */
-    "downlevelIteration": true,                     /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */
-    // "isolatedModules": true,                     /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */
-
-    /* Strict Type-Checking Options */
-    "strict": true,                                 /* Enable all strict type-checking options. */
-    // "noImplicitAny": true,                       /* Raise error on expressions and declarations with an implied 'any' type. */
-    // "strictNullChecks": true,                    /* Enable strict null checks. */
-    // "strictFunctionTypes": true,                 /* Enable strict checking of function types. */
-    // "strictBindCallApply": true,                 /* Enable strict 'bind', 'call', and 'apply' methods on functions. */
-    // "strictPropertyInitialization": true,        /* Enable strict checking of property initialization in classes. */
-    // "noImplicitThis": true,                      /* Raise error on 'this' expressions with an implied 'any' type. */
-    // "alwaysStrict": true,                        /* Parse in strict mode and emit "use strict" for each source file. */
-
-    /* Additional Checks */
-    // "noUnusedLocals": true,                      /* Report errors on unused locals. */
-    // "noUnusedParameters": true,                  /* Report errors on unused parameters. */
-    // "noImplicitReturns": true,                   /* Report error when not all code paths in function return a value. */
-    // "noFallthroughCasesInSwitch": true,          /* Report errors for fallthrough cases in switch statement. */
-    // "noUncheckedIndexedAccess": true,            /* Include 'undefined' in index signature results */
-    // "noImplicitOverride": true,                  /* Ensure overriding members in derived classes are marked with an 'override' modifier. */
-    // "noPropertyAccessFromIndexSignature": true,  /* Require undeclared properties from index signatures to use element accesses. */
-
-    /* Module Resolution Options */
-    // "moduleResolution": "node",                  /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
-    // "baseUrl": "./",                             /* Base directory to resolve non-absolute module names. */
-    // "paths": {},                                 /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
-    // "rootDirs": [],                              /* List of root folders whose combined content represents the structure of the project at runtime. */
-    // "typeRoots": [],                             /* List of folders to include type definitions from. */
-    // "types": [],                                 /* Type declaration files to be included in compilation. */
-    // "allowSyntheticDefaultImports": true,        /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
-    "esModuleInterop": true,                        /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
-    // "preserveSymlinks": true,                    /* Do not resolve the real path of symlinks. */
-    // "allowUmdGlobalAccess": true,                /* Allow accessing UMD globals from modules. */
-
-    /* Source Map Options */
-    // "sourceRoot": "",                            /* Specify the location where debugger should locate TypeScript files instead of source locations. */
-    // "mapRoot": "",                               /* Specify the location where debugger should locate map files instead of generated locations. */
-    // "inlineSourceMap": true,                     /* Emit a single file with source maps instead of having a separate file. */
-    // "inlineSources": true,                       /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */
-
-    /* Experimental Options */
-    "experimentalDecorators": true,                 /* Enables experimental support for ES7 decorators. */
-    "emitDecoratorMetadata": true,                  /* Enables experimental support for emitting type metadata for decorators. */
-
-    /* Advanced Options */
-    "skipLibCheck": true,                           /* Skip type checking of declaration files. */
+    "target": "es5",
+    "module": "commonjs",
+    "declaration": true,
+    "sourceMap": true,
+    "rootDir": "src",
+    "outDir": "dist",
+    "downlevelIteration": true,
+    "strict": true,
+    "esModuleInterop": true,
+    "experimentalDecorators": true,
+    "emitDecoratorMetadata": true,
+    "skipLibCheck": true,
     "forceConsistentCasingInFileNames": true,
-    /* Disallow inconsistently-cased references to the same file. */
     "lib": [
       "dom",
       "es5",
@@ -78,11 +22,6 @@
     ]
   },
   "include": [
-    "src/**/*.ts",
+    "src/**/*.ts", "tests/**/*.ts"
   ],
-  "typedocOptions": {
-    "entryPoints": ["src/index.ts"],
-    "out": "./docs",
-    "excludeExternals": true
-  }
 }