@keymanapp/common-types 17.0.155-alpha → 17.0.157-alpha

package/build/src/kpj/keyman-developer-project.js

@@ -1,146 +1,165 @@
-//
-// Version 1.0 of Keyman Developer Project .kpj file
-//
-export class KeymanDeveloperProject {
-    projectFilename;
-    callbacks;
-    options;
-    files;
-    projectPath = '';
-    constructor(projectFilename, version, callbacks) {
-        this.projectFilename = projectFilename;
-        this.callbacks = callbacks;
-        this.projectPath = this.callbacks.path.dirname(this.projectFilename);
-        this.options = new KeymanDeveloperProjectOptions(version);
-        this.files = [];
-    }
-    /**
-     * Adds .kmn, .xml, .kps to project based on options.sourcePath
-     * @param projectFilename Full path to project.kpj (even if the file doesn't exist)
-     */
-    populateFiles() {
-        if (this.options.version != '2.0') {
-            throw new Error('populateFiles can only be called on a v2.0 project');
-        }
-        let sourcePath = this.resolveProjectPath(this.options.sourcePath);
-        let files = this.callbacks.fs.readdirSync(sourcePath);
-        for (let filename of files) {
-            let fullPath = this.callbacks.path.join(sourcePath, filename);
-            if (filename.match(/\.xml$/i)) {
-                if (!this.callbacks.fs.readFileSync(fullPath, 'utf-8').match(/ldmlKeyboard\.dtd/)) {
-                    // Skip this .xml because we assume it isn't really a keyboard .xml
-                    continue;
-                }
-            }
-            if (filename.match(/\.(kmn|kps|xml|model\.ts)$/i)) {
-                let file = new KeymanDeveloperProjectFile20(fullPath, this.callbacks);
-                this.files.push(file);
-            }
-        }
-    }
-    resolveProjectPath(p) {
-        // Replace placeholders in the target path
-        return p.replace('$PROJECTPATH', this.projectPath);
-    }
-    resolveInputFilePath(file) {
-        return this.callbacks.resolveFilename(this.projectFilename, file.filePath);
-    }
-    resolveOutputFilePath(file, sourceExt, targetExt) {
-        // Roughly corresponds to Delphi TProject.GetTargetFileName
-        let p = this.options.version == '1.0' ?
-            this.options.buildPath || '$SOURCEPATH' :
-            this.options.buildPath;
-        // Replace placeholders in the target path
-        if (this.options.version == '1.0') {
-            // TODO: do we need to support $VERSION?
-            // $SOURCEPATH only supported in 1.0 projects
-            p = p.replace('$SOURCEPATH', this.callbacks.path.dirname(this.resolveInputFilePath(file)));
-        }
-        p = this.resolveProjectPath(p);
-        let f = file.filename.replace(new RegExp(`\\${sourceExt}$`, 'i'), targetExt);
-        return this.callbacks.path.normalize(this.callbacks.path.join(p, f));
-    }
-}
-;
-export var KeymanDeveloperProjectType;
-(function (KeymanDeveloperProjectType) {
-    KeymanDeveloperProjectType[KeymanDeveloperProjectType["Keyboard"] = 0] = "Keyboard";
-    KeymanDeveloperProjectType[KeymanDeveloperProjectType["LexicalModel"] = 1] = "LexicalModel";
-})(KeymanDeveloperProjectType || (KeymanDeveloperProjectType = {}));
-;
-export class KeymanDeveloperProjectOptions {
-    buildPath;
-    sourcePath;
-    compilerWarningsAsErrors = false;
-    warnDeprecatedCode = true;
-    checkFilenameConventions = true;
-    projectType = KeymanDeveloperProjectType.Keyboard;
-    version;
-    constructor(version) {
-        this.version = version;
-        switch (version) {
-            case "1.0":
-                this.buildPath = '';
-                this.sourcePath = '';
-                break;
-            case "2.0":
-                this.buildPath = '$PROJECTPATH/build';
-                this.sourcePath = '$PROJECTPATH/source';
-                break;
-            default:
-                throw new Error('Invalid version');
-        }
-    }
-}
-;
-export class KeymanDeveloperProjectFile10 {
-    id; // 1.0 only
-    filename;
-    filePath;
-    fileVersion; // 1.0 only
-    fileType; // file extension of filename, but .model.ts is technically not the ext because of 2 periods
-    details; // 1.0 only
-    childFiles; // 1.0 only
-    constructor(id, filename, filePath, fileVersion, fileType) {
-        this.details = {};
-        this.childFiles = [];
-        this.id = id;
-        this.filename = filename;
-        this.filePath = filePath;
-        this.fileVersion = fileVersion;
-        this.fileType = fileType;
-    }
-}
-;
-export class KeymanDeveloperProjectFile20 {
-    callbacks;
-    filename;
-    filePath;
-    fileType; // file extension of filename, but .model.ts is technically not the ext because of 2 periods
-    constructor(filePath, callbacks) {
-        this.callbacks = callbacks;
-        this.filename = this.callbacks.path.basename(filePath);
-        this.filePath = filePath;
-        if (this.filename.match(/\.model\.ts$/)) {
-            // .model.ts is a bit of a hassle...
-            this.fileType = '.model.ts';
-        }
-        else {
-            this.fileType = this.callbacks.path.extname(this.filename);
-        }
-    }
-}
-;
-export class KeymanDeveloperProjectFileDetail_Kps {
-    name;
-    copyright;
-    version;
-}
-;
-export class KeymanDeveloperProjectFileDetail_Kmn {
-    name;
-    copyright;
-    message;
-}
-;
-//# sourceMappingURL=keyman-developer-project.js.map
+//
+// Version 1.0 of Keyman Developer Project .kpj file
+//
+!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},n=(new Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="835476e3-1010-5be5-81cd-250fb33235c1")}catch(e){}}();
+import { KeymanFileTypes } from '../main.js';
+export class KeymanDeveloperProject {
+    projectFilename;
+    callbacks;
+    options;
+    files;
+    projectPath = '';
+    constructor(projectFilename, version, callbacks) {
+        this.projectFilename = projectFilename;
+        this.callbacks = callbacks;
+        this.projectPath = this.callbacks.path.dirname(this.projectFilename);
+        this.options = new KeymanDeveloperProjectOptions(version);
+        this.files = [];
+    }
+    /**
+     * Adds .kmn, .xml, .kps to project based on options.sourcePath
+     * @param projectFilename Full path to project.kpj (even if the file doesn't exist)
+     */
+    populateFiles() {
+        if (this.options.version != '2.0') {
+            throw new Error('populateFiles can only be called on a v2.0 project');
+        }
+        let sourcePath = this.resolveProjectPath(this.options.sourcePath);
+        let files = this.callbacks.fs.readdirSync(sourcePath);
+        for (let filename of files) {
+            let fullPath = this.callbacks.path.join(sourcePath, filename);
+            if (KeymanFileTypes.filenameIs(filename, ".xml" /* KeymanFileTypes.Source.LdmlKeyboard */)) {
+                if (!this.callbacks.fs.readFileSync(fullPath, 'utf-8').match(/ldmlKeyboard\.dtd/)) {
+                    // Skip this .xml because we assume it isn't really a keyboard .xml
+                    continue;
+                }
+            }
+            if (KeymanFileTypes.sourceTypeFromFilename(filename) !== null) {
+                let file = new KeymanDeveloperProjectFile20(fullPath, this.callbacks);
+                this.files.push(file);
+            }
+        }
+        this.addMetadataFile();
+    }
+    isKeyboardProject() {
+        return !!this.files.find(file => file.fileType == ".kmn" /* KeymanFileTypes.Source.KeymanKeyboard */ || file.fileType == ".xml" /* KeymanFileTypes.Source.LdmlKeyboard */);
+    }
+    isLexicalModelProject() {
+        return !!this.files.find(file => file.fileType == ".model.ts" /* KeymanFileTypes.Source.Model */);
+    }
+    addMetadataFile() {
+        const ext = this.isLexicalModelProject() ? ".model_info" /* KeymanFileTypes.Source.ModelInfo */ : ".keyboard_info" /* KeymanFileTypes.Source.KeyboardInfo */;
+        if (this.files.find(file => KeymanFileTypes.filenameIs(file.filename, ext))) {
+            return;
+        }
+        const infoFile = this.callbacks.path.join(this.projectPath, this.callbacks.path.basename(this.projectFilename, ".kpj" /* KeymanFileTypes.Source.Project */) + ext);
+        this.files.push(new KeymanDeveloperProjectFile20(infoFile, this.callbacks));
+    }
+    resolveProjectPath(p) {
+        // Replace placeholders in the target path
+        return p.replace('$PROJECTPATH', this.projectPath);
+    }
+    resolveInputFilePath(file) {
+        return this.callbacks.resolveFilename(this.projectFilename, file.filePath);
+    }
+    resolveOutputFilePath(file, sourceExt, targetExt) {
+        // Roughly corresponds to Delphi TProject.GetTargetFileName
+        let p = this.options.version == '1.0' ?
+            this.options.buildPath || '$SOURCEPATH' :
+            this.options.buildPath;
+        // Replace placeholders in the target path
+        if (this.options.version == '1.0') {
+            // TODO: do we need to support $VERSION?
+            // $SOURCEPATH only supported in 1.0 projects
+            p = p.replace('$SOURCEPATH', this.callbacks.path.dirname(this.resolveInputFilePath(file)));
+        }
+        p = this.resolveProjectPath(p);
+        let f = file.filename.replace(new RegExp(`\\${sourceExt}$`, 'i'), targetExt);
+        return this.callbacks.path.normalize(this.callbacks.path.join(p, f));
+    }
+}
+;
+export var KeymanDeveloperProjectType;
+(function (KeymanDeveloperProjectType) {
+    KeymanDeveloperProjectType[KeymanDeveloperProjectType["Keyboard"] = 0] = "Keyboard";
+    KeymanDeveloperProjectType[KeymanDeveloperProjectType["LexicalModel"] = 1] = "LexicalModel";
+})(KeymanDeveloperProjectType || (KeymanDeveloperProjectType = {}));
+;
+export class KeymanDeveloperProjectOptions {
+    buildPath;
+    sourcePath;
+    compilerWarningsAsErrors = false;
+    warnDeprecatedCode = true;
+    checkFilenameConventions = false; // missing option defaults to False
+    projectType = KeymanDeveloperProjectType.Keyboard;
+    version;
+    constructor(version) {
+        this.version = version;
+        switch (version) {
+            case "1.0":
+                this.buildPath = '';
+                this.sourcePath = '';
+                break;
+            case "2.0":
+                this.buildPath = '$PROJECTPATH/build';
+                this.sourcePath = '$PROJECTPATH/source';
+                break;
+            default:
+                throw new Error('Invalid version');
+        }
+    }
+}
+;
+;
+export class KeymanDeveloperProjectFile10 {
+    id;
+    filePath;
+    fileVersion;
+    callbacks;
+    get filename() {
+        return this.callbacks.path.basename(this.filePath);
+    }
+    get fileType() {
+        return KeymanFileTypes.fromFilename(this.filename);
+    }
+    details; // 1.0 only
+    childFiles; // 1.0 only
+    constructor(id, filePath, fileVersion, callbacks) {
+        this.id = id;
+        this.filePath = filePath;
+        this.fileVersion = fileVersion;
+        this.callbacks = callbacks;
+        this.details = {};
+        this.childFiles = [];
+    }
+}
+;
+export class KeymanDeveloperProjectFile20 {
+    filePath;
+    callbacks;
+    get filename() {
+        return this.callbacks.path.basename(this.filePath);
+    }
+    get fileType() {
+        return KeymanFileTypes.fromFilename(this.filename);
+    }
+    constructor(filePath, callbacks) {
+        this.filePath = filePath;
+        this.callbacks = callbacks;
+    }
+}
+;
+export class KeymanDeveloperProjectFileDetail_Kps {
+    name;
+    copyright;
+    version;
+}
+;
+export class KeymanDeveloperProjectFileDetail_Kmn {
+    name;
+    copyright;
+    message;
+}
+;
+//# debugId=835476e3-1010-5be5-81cd-250fb33235c1
+//# sourceMappingURL=keyman-developer-project.js.map

package/build/src/kpj/keyman-developer-project.js.map

@@ -1 +1 @@
-{"version":3,"file":"keyman-developer-project.js","sourceRoot":"","sources":["../../../src/kpj/keyman-developer-project.ts"],"names":[],"mappings":"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"}
+{"debug_id":"835476e3-1010-5be5-81cd-250fb33235c1","file":"keyman-developer-project.js","mappings":"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","names":[],"sourceRoot":"","sources":["../../../src/kpj/keyman-developer-project.ts"],"version":3}

package/build/src/kpj/kpj-file-reader.d.ts

@@ -1,19 +1,21 @@
-import { KPJFile } from './kpj-file.js';
-import { KeymanDeveloperProject } from './keyman-developer-project.js';
-import { CompilerCallbacks } from '../util/compiler-interfaces.js';
-export declare class KPJFileReader {
-    private callbacks;
-    constructor(callbacks: CompilerCallbacks);
-    read(file: Uint8Array): KPJFile;
-    validate(source: KPJFile, schemaBuffer: Uint8Array): void;
-    private boolFromString;
-    transform(projectFilename: string, source: KPJFile): KeymanDeveloperProject;
-    private transformFilesVersion10;
-    /**
-     * xml2js will not place single-entry objects into arrays.
-     * Easiest way to fix this is to box them ourselves as needed
-     * @param source KVKSourceFile
-     */
-    private boxArrays;
-}
-//# sourceMappingURL=kpj-file-reader.d.ts.map
+!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},n=(new Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="ec62180e-bfad-5ec5-aed9-a0e814bc07bd")}catch(e){}}();
+import { KPJFile } from './kpj-file.js';
+import { KeymanDeveloperProject } from './keyman-developer-project.js';
+import { CompilerCallbacks } from '../util/compiler-interfaces.js';
+export declare class KPJFileReader {
+    private callbacks;
+    constructor(callbacks: CompilerCallbacks);
+    read(file: Uint8Array): KPJFile;
+    validate(source: KPJFile): void;
+    private boolFromString;
+    transform(projectFilename: string, source: KPJFile): KeymanDeveloperProject;
+    private transformFilesVersion10;
+    /**
+     * xml2js will not place single-entry objects into arrays.
+     * Easiest way to fix this is to box them ourselves as needed
+     * @param source KVKSourceFile
+     */
+    private boxArrays;
+}
+//# debugId=ec62180e-bfad-5ec5-aed9-a0e814bc07bd
+//# sourceMappingURL=kpj-file-reader.d.ts.map

package/build/src/kpj/kpj-file-reader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"kpj-file-reader.d.ts","sourceRoot":"","sources":["../../../src/kpj/kpj-file-reader.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAkB,MAAM,eAAe,CAAC;AAIxD,OAAO,EAAE,sBAAsB,EAA4D,MAAM,+BAA+B,CAAC;AACjI,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AAEnE,qBAAa,aAAa;IACZ,OAAO,CAAC,SAAS;gBAAT,SAAS,EAAE,iBAAiB;IAIzC,IAAI,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO;IAgB/B,QAAQ,CAAC,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,UAAU,GAAG,IAAI;IAQhE,OAAO,CAAC,cAAc;IAOf,SAAS,CAAC,eAAe,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,GAAG,sBAAsB;IA6BlF,OAAO,CAAC,uBAAuB;IAyB/B;;;;OAIG;IACH,OAAO,CAAC,SAAS;CAIlB"}
+{"debug_id":"ec62180e-bfad-5ec5-aed9-a0e814bc07bd","file":"kpj-file-reader.d.ts","mappings":";AACA,OAAO,EAAE,OAAO,EAAkB,MAAM,eAAe,CAAC;AAIxD,OAAO,EAAE,sBAAsB,EAA4D,MAAM,+BAA+B,CAAC;AACjI,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AAGnE,qBAAa,aAAa;IACZ,OAAO,CAAC,SAAS;gBAAT,SAAS,EAAE,iBAAiB;IAIzC,IAAI,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO;IAsB/B,QAAQ,CAAC,MAAM,EAAE,OAAO,GAAG,IAAI;IAYtC,OAAO,CAAC,cAAc;IAOf,SAAS,CAAC,eAAe,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,GAAG,sBAAsB;IA8BlF,OAAO,CAAC,uBAAuB;IAwB/B;;;;OAIG;IACH,OAAO,CAAC,SAAS;CAIlB","names":[],"sourceRoot":"","sources":["../../../src/kpj/kpj-file-reader.ts"],"version":3}

package/build/src/kpj/kpj-file-reader.js

@@ -1,96 +1,110 @@
-import * as xml2js from 'xml2js';
-import { default as AjvModule } from 'ajv';
-const Ajv = AjvModule.default; // The actual expected Ajv type.
-import { boxXmlArray } from '../util/util.js';
-import { KeymanDeveloperProject, KeymanDeveloperProjectFile10, KeymanDeveloperProjectType } from './keyman-developer-project.js';
-export class KPJFileReader {
-    callbacks;
-    constructor(callbacks) {
-        this.callbacks = callbacks;
-    }
-    read(file) {
-        let data;
-        const parser = new xml2js.Parser({
-            explicitArray: false,
-            mergeAttrs: false,
-            includeWhiteChars: false,
-            normalize: false,
-            emptyTag: ''
-        });
-        parser.parseString(file, (e, r) => { data = r; });
-        data = this.boxArrays(data);
-        return data;
-    }
-    validate(source, schemaBuffer) {
-        const schema = JSON.parse(new TextDecoder().decode(schemaBuffer));
-        const ajv = new Ajv();
-        if (!ajv.validate(schema, source)) {
-            throw new Error(ajv.errorsText());
-        }
-    }
-    boolFromString(value, def) {
-        value = (value || '').toLowerCase();
-        if (value === 'true')
-            return true;
-        if (value === 'false')
-            return false;
-        return def;
-    }
-    transform(projectFilename, source) {
-        // NOTE: at this point, the xml should have been validated
-        // and matched the schema result so we can assume the source
-        // is a valid shape
-        let project = source.KeymanDeveloperProject;
-        let result = new KeymanDeveloperProject(projectFilename, project.Options?.Version || "1.0", this.callbacks);
-        if (result.options.version == '2.0') {
-            result.options.buildPath = (project.Options?.BuildPath || result.options.buildPath).replace(/\\/g, '/');
-            result.options.sourcePath = (project.Options?.SourcePath || result.options.sourcePath).replace(/\\/g, '/');
-        }
-        else {
-            result.options.buildPath = (project.Options?.BuildPath || '').replace(/\\/g, '/');
-        }
-        result.options.checkFilenameConventions = this.boolFromString(project.Options?.CheckFilenameConventions, true);
-        result.options.compilerWarningsAsErrors = this.boolFromString(project.Options?.CompilerWarningsAsErrors, false);
-        result.options.warnDeprecatedCode = this.boolFromString(project.Options?.WarnDeprecatedCode, true);
-        result.options.projectType =
-            project.Options?.ProjectType == 'keyboard' ? KeymanDeveloperProjectType.Keyboard :
-                project.Options?.ProjectType == 'lexicalmodel' ? KeymanDeveloperProjectType.LexicalModel :
-                    KeymanDeveloperProjectType.Keyboard; // Default is keyboard if missing
-        if (result.options.version == '1.0') {
-            this.transformFilesVersion10(project, result);
-        }
-        else {
-            result.populateFiles();
-        }
-        return result;
-    }
-    transformFilesVersion10(project, result) {
-        let ids = {};
-        for (let sourceFile of project.Files?.File) {
-            let file = new KeymanDeveloperProjectFile10(sourceFile.ID || '', sourceFile.Filename || '', (sourceFile.Filepath || '').replace(/\\/g, '/'), sourceFile.FileVersion || '', sourceFile.FileType || '');
-            if (sourceFile.Details) {
-                file.details.copyright = sourceFile.Details.Copyright;
-                file.details.name = sourceFile.Details.Name;
-                file.details.message = sourceFile.Details.Message;
-                file.details.version = sourceFile.Details.Version;
-            }
-            if (sourceFile.ParentFileID && ids[sourceFile.ParentFileID]) {
-                ids[sourceFile.ParentFileID].childFiles.push(file);
-            }
-            else {
-                result.files.push(file);
-                ids[file.id] = file;
-            }
-        }
-    }
-    /**
-     * xml2js will not place single-entry objects into arrays.
-     * Easiest way to fix this is to box them ourselves as needed
-     * @param source KVKSourceFile
-     */
-    boxArrays(source) {
-        boxXmlArray(source.KeymanDeveloperProject?.Files, 'File');
-        return source;
-    }
-}
-//# sourceMappingURL=kpj-file-reader.js.map
+!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},n=(new Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="ac2a96ae-38af-5a97-9ebb-d663369706eb")}catch(e){}}();
+import * as xml2js from 'xml2js';
+import { default as AjvModule } from 'ajv';
+const Ajv = AjvModule.default; // The actual expected Ajv type.
+import { boxXmlArray } from '../util/util.js';
+import { KeymanDeveloperProject, KeymanDeveloperProjectFile10, KeymanDeveloperProjectType } from './keyman-developer-project.js';
+import Schemas from '../schemas.js';
+export class KPJFileReader {
+    callbacks;
+    constructor(callbacks) {
+        this.callbacks = callbacks;
+    }
+    read(file) {
+        let data;
+        const parser = new xml2js.Parser({
+            explicitArray: false,
+            mergeAttrs: false,
+            includeWhiteChars: false,
+            normalize: false,
+            emptyTag: ''
+        });
+        parser.parseString(file, (e, r) => { data = r; });
+        data = this.boxArrays(data);
+        for (let file of data.KeymanDeveloperProject?.Files?.File) {
+            // xml2js imports <Details/> as '' so we will just delete the empty string
+            if (typeof file.Details == 'string') {
+                delete file.Details;
+            }
+        }
+        return data;
+    }
+    validate(source) {
+        const ajv = new Ajv();
+        if (!ajv.validate(Schemas.kpj, source)) {
+            const ajvLegacy = new Ajv();
+            if (!ajvLegacy.validate(Schemas.kpj90, source)) {
+                // If the legacy schema also does not validate, then we will only report
+                // the errors against the modern schema
+                throw new Error(ajv.errorsText());
+            }
+        }
+    }
+    boolFromString(value, def) {
+        value = (value || '').toLowerCase();
+        if (value === 'true')
+            return true;
+        if (value === 'false')
+            return false;
+        return def;
+    }
+    transform(projectFilename, source) {
+        // NOTE: at this point, the xml should have been validated
+        // and matched the schema result so we can assume the source
+        // is a valid shape
+        let project = source.KeymanDeveloperProject;
+        let result = new KeymanDeveloperProject(projectFilename, project.Options?.Version || "1.0", this.callbacks);
+        if (result.options.version == '2.0') {
+            result.options.buildPath = (project.Options?.BuildPath || result.options.buildPath).replace(/\\/g, '/');
+            result.options.sourcePath = (project.Options?.SourcePath || result.options.sourcePath).replace(/\\/g, '/');
+        }
+        else {
+            result.options.buildPath = (project.Options?.BuildPath || '').replace(/\\/g, '/');
+        }
+        result.options.checkFilenameConventions = this.boolFromString(project.Options?.CheckFilenameConventions, false);
+        result.options.compilerWarningsAsErrors = this.boolFromString(project.Options?.CompilerWarningsAsErrors, false);
+        result.options.warnDeprecatedCode = this.boolFromString(project.Options?.WarnDeprecatedCode, true);
+        result.options.projectType =
+            project.Options?.ProjectType == 'keyboard' ? KeymanDeveloperProjectType.Keyboard :
+                project.Options?.ProjectType == 'lexicalmodel' ? KeymanDeveloperProjectType.LexicalModel :
+                    KeymanDeveloperProjectType.Keyboard; // Default is keyboard if missing
+        if (result.options.version == '1.0') {
+            this.transformFilesVersion10(project, result);
+            result.addMetadataFile();
+        }
+        else {
+            result.populateFiles();
+        }
+        return result;
+    }
+    transformFilesVersion10(project, result) {
+        let ids = {};
+        for (let sourceFile of project.Files?.File) {
+            let file = new KeymanDeveloperProjectFile10(sourceFile.ID || '', (sourceFile.Filepath || '').replace(/\\/g, '/'), sourceFile.FileVersion || '', this.callbacks);
+            if (sourceFile.Details) {
+                file.details.copyright = sourceFile.Details.Copyright;
+                file.details.name = sourceFile.Details.Name;
+                file.details.message = sourceFile.Details.Message;
+                file.details.version = sourceFile.Details.Version;
+            }
+            if (sourceFile.ParentFileID && ids[sourceFile.ParentFileID]) {
+                ids[sourceFile.ParentFileID].childFiles.push(file);
+            }
+            else {
+                result.files.push(file);
+                ids[file.id] = file;
+            }
+        }
+    }
+    /**
+     * xml2js will not place single-entry objects into arrays.
+     * Easiest way to fix this is to box them ourselves as needed
+     * @param source KVKSourceFile
+     */
+    boxArrays(source) {
+        boxXmlArray(source.KeymanDeveloperProject?.Files, 'File');
+        return source;
+    }
+}
+//# debugId=ac2a96ae-38af-5a97-9ebb-d663369706eb
+//# sourceMappingURL=kpj-file-reader.js.map